The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
Color Key Cleanup (#65855)
Nick Fitzpatrick3975adb9326d
diff --git a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_card_filters_Full_Width_Heading_Many_Filters.png b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_card_filters_Full_Width_Heading_Many_Filters.pngindex e9c9b3ebbaf..03bbc1383b2 100644Binary files a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_card_filters_Full_Width_Heading_Many_Filters.png and b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_card_filters_Full_Width_Heading_Many_Filters.png differdiff --git a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_card_filters_Narrow_Heading_Many_Filters.png b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_card_filters_Narrow_Heading_Many_Filters.pngindex abc613d6b32..c4e4dda3e0f 100644Binary files a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_card_filters_Narrow_Heading_Many_Filters.png and b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_card_filters_Narrow_Heading_Many_Filters.png differdiff --git a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_card_filters_Narrow_Heading_One_Filter.png b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_card_filters_Narrow_Heading_One_Filter.pngindex e51bd7a3ded..6b5283777cf 100644Binary files a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_card_filters_Narrow_Heading_One_Filter.png and b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedDashboardView_card_filters_Narrow_Heading_One_Filter.png differdiff --git a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedQuestionView_Pivot_Table_Dark_Theme.png b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedQuestionView_Pivot_Table_Dark_Theme.pngindex ffc768d19d8..813a13a294e 100644Binary files a/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedQuestionView_Pivot_Table_Dark_Theme.png and b/.loki/reference/chrome_laptop_App_Embed_PublicOrEmbeddedQuestionView_Pivot_Table_Dark_Theme.png differdiff --git a/.loki/reference/chrome_laptop_Components_Feedback_Alert_Dark.png b/.loki/reference/chrome_laptop_Components_Feedback_Alert_Dark.pngindex 88eb2558002..6f2dd0e6337 100644Binary files a/.loki/reference/chrome_laptop_Components_Feedback_Alert_Dark.png and b/.loki/reference/chrome_laptop_Components_Feedback_Alert_Dark.png differdiff --git a/.loki/reference/chrome_laptop_Components_Feedback_Alert_Light.png b/.loki/reference/chrome_laptop_Components_Feedback_Alert_Light.pngindex 033b24cc16b..c1958b53d55 100644Binary files a/.loki/reference/chrome_laptop_Components_Feedback_Alert_Light.png and b/.loki/reference/chrome_laptop_Components_Feedback_Alert_Light.png differdiff --git a/.loki/reference/chrome_laptop_Design_System_Colors_Default.png b/.loki/reference/chrome_laptop_Design_System_Colors_Default.pngindex 5fec4c509ef..1388caac7b1 100644Binary files a/.loki/reference/chrome_laptop_Design_System_Colors_Default.png and b/.loki/reference/chrome_laptop_Design_System_Colors_Default.png differdiff --git a/.loki/reference/chrome_laptop_viz_BarChart_Default.png b/.loki/reference/chrome_laptop_viz_BarChart_Default.pngindex 7086d971b6d..6e7a4c4d8bd 100644Binary files a/.loki/reference/chrome_laptop_viz_BarChart_Default.png and b/.loki/reference/chrome_laptop_viz_BarChart_Default.png differdiff --git a/.loki/reference/chrome_laptop_viz_PivotTable_Embedding_Theme.png b/.loki/reference/chrome_laptop_viz_PivotTable_Embedding_Theme.pngindex e72e0c7c24c..c985c9089ee 100644Binary files a/.loki/reference/chrome_laptop_viz_PivotTable_Embedding_Theme.png and b/.loki/reference/chrome_laptop_viz_PivotTable_Embedding_Theme.png differdiff --git a/.loki/reference/chrome_laptop_viz_SankeyChart_Sankey_Disconnected_Graphs.png b/.loki/reference/chrome_laptop_viz_SankeyChart_Sankey_Disconnected_Graphs.pngindex 6ead96322a6..21315668278 100644Binary files a/.loki/reference/chrome_laptop_viz_SankeyChart_Sankey_Disconnected_Graphs.png and b/.loki/reference/chrome_laptop_viz_SankeyChart_Sankey_Disconnected_Graphs.png differdiff --git a/.loki/reference/chrome_laptop_viz_SankeyChart_Sankey_Edge_Labels_Auto.png b/.loki/reference/chrome_laptop_viz_SankeyChart_Sankey_Edge_Labels_Auto.pngindex 175d09ae0d3..a360af833ee 100644Binary files a/.loki/reference/chrome_laptop_viz_SankeyChart_Sankey_Edge_Labels_Auto.png and b/.loki/reference/chrome_laptop_viz_SankeyChart_Sankey_Edge_Labels_Auto.png differdiff --git a/.loki/reference/chrome_laptop_viz_SankeyChart_Sankey_Edge_Labels_Compact.png b/.loki/reference/chrome_laptop_viz_SankeyChart_Sankey_Edge_Labels_Compact.pngindex 3f3c76e9fcc..528d835d662 100644Binary files a/.loki/reference/chrome_laptop_viz_SankeyChart_Sankey_Edge_Labels_Compact.png and b/.loki/reference/chrome_laptop_viz_SankeyChart_Sankey_Edge_Labels_Compact.png differdiff --git a/.loki/reference/chrome_laptop_viz_SankeyChart_Sankey_Edge_Labels_Full.png b/.loki/reference/chrome_laptop_viz_SankeyChart_Sankey_Edge_Labels_Full.pngindex 612888d50af..eb3c5d45714 100644Binary files a/.loki/reference/chrome_laptop_viz_SankeyChart_Sankey_Edge_Labels_Full.png and b/.loki/reference/chrome_laptop_viz_SankeyChart_Sankey_Edge_Labels_Full.png differdiff --git a/.loki/reference/chrome_laptop_viz_SankeyChart_Sankey_Gray_Edges.png b/.loki/reference/chrome_laptop_viz_SankeyChart_Sankey_Gray_Edges.pngindex 25bc74a2786..53a10a4f5a7 100644Binary files a/.loki/reference/chrome_laptop_viz_SankeyChart_Sankey_Gray_Edges.png and b/.loki/reference/chrome_laptop_viz_SankeyChart_Sankey_Gray_Edges.png differdiff --git a/.loki/reference/chrome_laptop_viz_SankeyChart_Sankey_Node_Align_Justify.png b/.loki/reference/chrome_laptop_viz_SankeyChart_Sankey_Node_Align_Justify.pngindex 33e8252538c..49d94f97251 100644Binary files a/.loki/reference/chrome_laptop_viz_SankeyChart_Sankey_Node_Align_Justify.png and b/.loki/reference/chrome_laptop_viz_SankeyChart_Sankey_Node_Align_Justify.png differdiff --git a/.loki/reference/chrome_laptop_viz_SankeyChart_Sankey_Node_Align_Left.png b/.loki/reference/chrome_laptop_viz_SankeyChart_Sankey_Node_Align_Left.pngindex 86b632887de..095b61755ef 100644Binary files a/.loki/reference/chrome_laptop_viz_SankeyChart_Sankey_Node_Align_Left.png and b/.loki/reference/chrome_laptop_viz_SankeyChart_Sankey_Node_Align_Left.png differdiff --git a/.loki/reference/chrome_laptop_viz_SankeyChart_Sankey_Node_Align_Right.png b/.loki/reference/chrome_laptop_viz_SankeyChart_Sankey_Node_Align_Right.pngindex 55dcd11ef4e..0f9860238be 100644Binary files a/.loki/reference/chrome_laptop_viz_SankeyChart_Sankey_Node_Align_Right.png and b/.loki/reference/chrome_laptop_viz_SankeyChart_Sankey_Node_Align_Right.png differdiff --git a/.loki/reference/chrome_laptop_viz_SankeyChart_Sankey_Target_Color_Edges.png b/.loki/reference/chrome_laptop_viz_SankeyChart_Sankey_Target_Color_Edges.pngindex 2da0037d178..7018c0fafea 100644Binary files a/.loki/reference/chrome_laptop_viz_SankeyChart_Sankey_Target_Color_Edges.png and b/.loki/reference/chrome_laptop_viz_SankeyChart_Sankey_Target_Color_Edges.png differdiff --git a/.loki/reference/chrome_laptop_viz_SankeyChart_Sankey_Unaggregated_Data.png b/.loki/reference/chrome_laptop_viz_SankeyChart_Sankey_Unaggregated_Data.pngindex 56a5e2119e4..e86b00f12a6 100644Binary files a/.loki/reference/chrome_laptop_viz_SankeyChart_Sankey_Unaggregated_Data.png and b/.loki/reference/chrome_laptop_viz_SankeyChart_Sankey_Unaggregated_Data.png differdiff --git a/.loki/reference/chrome_laptop_viz_SankeyChart_Sankey_With_Edges_Labels.png b/.loki/reference/chrome_laptop_viz_SankeyChart_Sankey_With_Edges_Labels.pngindex a255d87ed50..3fa3e07c8a5 100644Binary files a/.loki/reference/chrome_laptop_viz_SankeyChart_Sankey_With_Edges_Labels.png and b/.loki/reference/chrome_laptop_viz_SankeyChart_Sankey_With_Edges_Labels.png differdiff --git a/.storybook/preview.tsx b/.storybook/preview.tsxindex 7062a441278..e0e6f1f601e 100644--- a/.storybook/preview.tsx+++ b/.storybook/preview.tsx@@ -120,8 +120,8 @@ function CssVariables() {Theming-specific CSS variables.These CSS variables are not part of the core design system colors.**/- --mb-color-bg-dashboard: var(--mb-color-bg-white);- --mb-color-bg-dashboard-card: var(--mb-color-bg-white);+ --mb-color-bg-dashboard: var(--mb-color-background-primary);+ --mb-color-bg-dashboard-card: var(--mb-color-background-primary);}/* For Embed frame questions to render properly */diff --git a/e2e/support/config.js b/e2e/support/config.jsindex 649fc856459..cd61cd63255 100644--- a/e2e/support/config.js+++ b/e2e/support/config.js@@ -88,6 +88,7 @@ const defaultConfig = {// Open dev tools in Chrome by defaultif (browser.name === "chrome" || browser.name === "chromium") {launchOptions.args.push("--auto-open-devtools-for-tabs");+ launchOptions.args.push("--blink-settings=preferredColorScheme=1");}// Start browsers with prefers-reduced-motion set to "reduce"diff --git a/e2e/support/helpers/e2e-setup-helpers.js b/e2e/support/helpers/e2e-setup-helpers.jsindex 25a7529aa88..1f1e3139563 100644--- a/e2e/support/helpers/e2e-setup-helpers.js+++ b/e2e/support/helpers/e2e-setup-helpers.js@@ -28,8 +28,5 @@ export function restore(name = "default") {resetWritableDb({ type: dbType });}- // Force the color scheme to be consistent, otherwise, it will pick up system color theme- window.localStorage.setItem("metabase-color-scheme", "light");-return cy.request("POST", `/api/testing/restore/${name}`);}diff --git a/e2e/support/helpers/e2e-visual-tests-helpers.js b/e2e/support/helpers/e2e-visual-tests-helpers.jsindex 685aac7d094..3871011c69c 100644--- a/e2e/support/helpers/e2e-visual-tests-helpers.js+++ b/e2e/support/helpers/e2e-visual-tests-helpers.js@@ -60,7 +60,7 @@ export function getXYTransform(element) {export function echartsIcon(name, isSelected = false) {const iconSvg = setSvgColor(Icons[name].source,- getColor(isSelected ? "brand" : "text-light"),+ getColor(isSelected ? "brand" : "text-tertiary"),);const dataUri = svgToDataUri(iconSvg);diff --git a/e2e/test/scenarios/models/models-list-view.cy.spec.js b/e2e/test/scenarios/models/models-list-view.cy.spec.jsindex 22d9d95c710..661cb4d3f2c 100644--- a/e2e/test/scenarios/models/models-list-view.cy.spec.js+++ b/e2e/test/scenarios/models/models-list-view.cy.spec.js@@ -1,3 +1,7 @@+const Color = require("color");++const { colors } = require("metabase/lib/colors");+const { H } = cy;describe("scenarios > models list view", () => {@@ -162,19 +166,26 @@ describe("scenarios > models list view", () => {cy.findByRole("img", { name: "factory icon" }).should("have.attr", "aria-label", "factory icon").click();- cy.findByTestId("list-view-icon-colors").then(($list) => {- const $button = Cypress.$($list).find("button").eq(2);- expect($button.attr("style")).to.include(- "background: var(--mb-color-accent1)",- );- $button.click();- });++ cy.findByTestId("list-view-icon-colors")+ .findAllByRole("button")+ .eq(2)+ .should(+ "have.css",+ "backgroundColor",+ Color(colors["accent1"]).rgb().toString(),+ )+ .click();});cy.get("@listPreview").within(() => {cy.findAllByRole("img").first()- .should("have.attr", "style", "color: var(--mb-color-accent1);")- .and("have.attr", "aria-label", "factory icon");+ .should("have.attr", "aria-label", "factory icon")+ .should(+ "have.css",+ "color",+ Color(colors["accent1"]).rgb().toString(),+ );});cy.findByTestId("dataset-edit-bar").button("Save changes").click();diff --git a/enterprise/frontend/src/embedding-sdk-ee/metabot/MetabotChatInput.tsx b/enterprise/frontend/src/embedding-sdk-ee/metabot/MetabotChatInput.tsxindex 91ef8031f39..c1fd3c154fe 100644--- a/enterprise/frontend/src/embedding-sdk-ee/metabot/MetabotChatInput.tsx+++ b/enterprise/frontend/src/embedding-sdk-ee/metabot/MetabotChatInput.tsx@@ -34,7 +34,7 @@ export function MetabotChatInput() {{metabot.isDoingScience ? (<Loader size="sm" />) : (- <Icon name="ai" c="var(--mb-color-brand)" size="1rem" />+ <Icon name="ai" c="brand" size="1rem" />)}</Flex>@@ -78,7 +78,7 @@ export function MetabotChatInput() {className={cx(S.chatButton, S.stopGenerationButton)}><Tooltip label={t`Stop generation`}>- <Icon name="stop" c="var(--mb-color-text-secondary)" />+ <Icon name="stop" c="text-secondary" /></Tooltip></UnstyledButton>)}@@ -89,7 +89,7 @@ export function MetabotChatInput() {data-testid="metabot-close-chat"className={S.chatButton}>- <Icon name="close" c="var(--mb-color-text-secondary)" />+ <Icon name="close" c="text-secondary" /></UnstyledButton>)}@@ -100,7 +100,7 @@ export function MetabotChatInput() {data-testid="metabot-overflow-button"className={S.stackedOverflowButton}>- <Icon name="ellipsis" c="var(--mb-color-text-secondary)" />+ <Icon name="ellipsis" c="text-secondary" /></UnstyledButton></Menu.Target>diff --git a/enterprise/frontend/src/embedding-sdk-ee/metabot/MetabotQuestion.module.css b/enterprise/frontend/src/embedding-sdk-ee/metabot/MetabotQuestion.module.cssindex 37de4c33539..c6640443d93 100644--- a/enterprise/frontend/src/embedding-sdk-ee/metabot/MetabotQuestion.module.css+++ b/enterprise/frontend/src/embedding-sdk-ee/metabot/MetabotQuestion.module.css@@ -89,7 +89,7 @@width: fit-content;border-radius: 8px;border: 1px solid var(--mb-color-border);- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);color: var(--mb-color-text-secondary);font-size: 0.875rem;}diff --git a/enterprise/frontend/src/embedding-sdk-ee/metabot/MetabotQuestion.stories.tsx b/enterprise/frontend/src/embedding-sdk-ee/metabot/MetabotQuestion.stories.tsxindex 8b93f207550..f426278a174 100644--- a/enterprise/frontend/src/embedding-sdk-ee/metabot/MetabotQuestion.stories.tsx+++ b/enterprise/frontend/src/embedding-sdk-ee/metabot/MetabotQuestion.stories.tsx@@ -105,7 +105,7 @@ const CenteredLayoutPreview = ({ children }: { children: React.ReactNode }) => (<Stack align="center" justify="center"><Flexm="40px"- bg="var(--mb-color-background)"+ bg="background-primary"style={{border: "1px solid var(--mb-color-border)",borderRadius: "16px",diff --git a/enterprise/frontend/src/embedding-sdk-ee/metabot/QuestionDetails.tsx b/enterprise/frontend/src/embedding-sdk-ee/metabot/QuestionDetails.tsxindex 8181c041ff2..cda5100819b 100644--- a/enterprise/frontend/src/embedding-sdk-ee/metabot/QuestionDetails.tsx+++ b/enterprise/frontend/src/embedding-sdk-ee/metabot/QuestionDetails.tsx@@ -45,7 +45,7 @@ export function QuestionDetails() {].filter((section) => section.length > 0);return (- <Text size="0.75rem" c="var(--mb-color-text-tertiary)">+ <Text size="0.75rem" c="text-tertiary">{sections.join(" ")}</Text>);diff --git a/enterprise/frontend/src/embedding-sdk-ee/metabot/QuestionTitle.tsx b/enterprise/frontend/src/embedding-sdk-ee/metabot/QuestionTitle.tsxindex 0998182a49c..650545eeea9 100644--- a/enterprise/frontend/src/embedding-sdk-ee/metabot/QuestionTitle.tsx+++ b/enterprise/frontend/src/embedding-sdk-ee/metabot/QuestionTitle.tsx@@ -11,7 +11,7 @@ export function QuestionTitle() {}return (- <Text fw={700} c="var(--mb-color-text-primary)" fz="xl">+ <Text fw={700} c="text-primary" fz="xl">{titleText}</Text>);diff --git a/enterprise/frontend/src/embedding-sdk-ee/metabot/SidebarHeader.tsx b/enterprise/frontend/src/embedding-sdk-ee/metabot/SidebarHeader.tsxindex d198a737725..e07164a24d6 100644--- a/enterprise/frontend/src/embedding-sdk-ee/metabot/SidebarHeader.tsx+++ b/enterprise/frontend/src/embedding-sdk-ee/metabot/SidebarHeader.tsx@@ -16,7 +16,7 @@ export function SidebarHeader() {align="center"className={S.sidebarHeader}>- <Text fz="sm" c="var(--mb-color-text-tertiary)">+ <Text fz="sm" c="text-tertiary">{t`AI isn't perfect. Double-check results.`}</Text>@@ -25,11 +25,7 @@ export function SidebarHeader() {onClick={() => metabot.resetConversation()}data-testid="metabot-new-conversation">- <Icon- name="edit_document_outlined"- size="1rem"- c="var(--mb-color-text-tertiary)"- />+ <Icon name="edit_document_outlined" size="1rem" c="text-tertiary" /></UnstyledButton></Tooltip></Flex>diff --git a/enterprise/frontend/src/embedding-sdk-package/components/private/Error/Error.tsx b/enterprise/frontend/src/embedding-sdk-package/components/private/Error/Error.tsxindex c8a1b4b93d2..24fa8784c9c 100644--- a/enterprise/frontend/src/embedding-sdk-package/components/private/Error/Error.tsx+++ b/enterprise/frontend/src/embedding-sdk-package/components/private/Error/Error.tsx@@ -16,8 +16,8 @@ const DefaultErrorMessage = ({ message, theme }: Props) => {display: "flex",alignItems: "center",padding: "1.25rem 1rem",- background: theme?.colors?.background ?? colors["bg-error"],- color: theme?.colors?.["text-primary"] ?? colors["text-dark"],+ background: theme?.colors?.background ?? colors["background-error"],+ color: theme?.colors?.["text-primary"] ?? colors["text-primary"],border: `1px solid ${theme?.colors?.error ?? colors.error}`,borderRadius: "0.5rem",textAlign: "center",diff --git a/enterprise/frontend/src/embedding/data-picker/DataSelector/DataSelector.module.css b/enterprise/frontend/src/embedding/data-picker/DataSelector/DataSelector.module.cssindex 2ccdae3b7a7..aa541bec056 100644--- a/enterprise/frontend/src/embedding/data-picker/DataSelector/DataSelector.module.css+++ b/enterprise/frontend/src/embedding/data-picker/DataSelector/DataSelector.module.css@@ -20,7 +20,7 @@.TextSchema {font-size: 0.75em;- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);line-height: 0.75rem;text-transform: uppercase;letter-spacing: 0.06em;@@ -28,7 +28,7 @@.BackButtonLabel {font-size: 16px;- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);margin-left: 0.5rem;overflow-wrap: anywhere;word-break: break-word;diff --git a/enterprise/frontend/src/embedding/data-picker/DataSelectorDataBucketPicker/DataSelectorDataBucketPicker.module.css b/enterprise/frontend/src/embedding/data-picker/DataSelectorDataBucketPicker/DataSelectorDataBucketPicker.module.cssindex ad006ae7111..5435a76b1ea 100644--- a/enterprise/frontend/src/embedding/data-picker/DataSelectorDataBucketPicker/DataSelectorDataBucketPicker.module.css+++ b/enterprise/frontend/src/embedding/data-picker/DataSelectorDataBucketPicker/DataSelectorDataBucketPicker.module.css@@ -3,20 +3,20 @@}.DataBucketListItemTitle {- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);font-weight: 700;font-size: 14px;margin-left: 0.5rem;}.DataBucketListItemDescription {- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);font-weight: 700;font-size: 12px;}.DataBucketListItemIcon {- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);}.DataBucketListItemContainer {@@ -24,7 +24,7 @@.DataBucketListItemDescription,.DataBucketListItemTitle,.DataBucketListItemIcon {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);}}}diff --git a/enterprise/frontend/src/embedding/data-picker/DataSelectorFieldPicker/DataSelectorFieldPicker.module.css b/enterprise/frontend/src/embedding/data-picker/DataSelectorFieldPicker/DataSelectorFieldPicker.module.cssindex b0f621f0f43..6813c0f3d0a 100644--- a/enterprise/frontend/src/embedding/data-picker/DataSelectorFieldPicker/DataSelectorFieldPicker.module.css+++ b/enterprise/frontend/src/embedding/data-picker/DataSelectorFieldPicker/DataSelectorFieldPicker.module.css@@ -4,7 +4,7 @@.HeaderContainer {align-items: center;- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);cursor: pointer;display: flex;gap: 0.5rem;diff --git a/enterprise/frontend/src/embedding/data-picker/DataSelectorSectionHeader/DataSelectorSectionHeader.module.css b/enterprise/frontend/src/embedding/data-picker/DataSelectorSectionHeader/DataSelectorSectionHeader.module.cssindex 532c32b13fd..43b2a6be39e 100644--- a/enterprise/frontend/src/embedding/data-picker/DataSelectorSectionHeader/DataSelectorSectionHeader.module.css+++ b/enterprise/frontend/src/embedding/data-picker/DataSelectorSectionHeader/DataSelectorSectionHeader.module.css@@ -3,5 +3,5 @@}.Header {- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);}diff --git a/enterprise/frontend/src/embedding/data-picker/DataSelectorTablePicker/DataSelectorTablePicker.tsx b/enterprise/frontend/src/embedding/data-picker/DataSelectorTablePicker/DataSelectorTablePicker.tsxindex a8a9d325cf7..716411fd676 100644--- a/enterprise/frontend/src/embedding/data-picker/DataSelectorTablePicker/DataSelectorTablePicker.tsx+++ b/enterprise/frontend/src/embedding/data-picker/DataSelectorTablePicker/DataSelectorTablePicker.tsx@@ -162,7 +162,7 @@ const LinkToDocsOnReferencingSavedQuestionsInQueries = () => {<Boxp="md"ta="center"- bg={"bg-light"}+ bg={"background-secondary"}style={{borderTop: "1px solid var(--mb-color-border)",}}@@ -195,10 +195,10 @@ const Header = ({{selectedSchema?.name && schemas.length > 1 && (<>- <Box component="span" mx="sm" c="text-medium">+ <Box component="span" mx="sm" c="text-secondary">/</Box>- <Box component="span" data-testid="source-schema" c="text-medium">+ <Box component="span" data-testid="source-schema" c="text-secondary">{selectedSchema.displayName()}</Box></>diff --git a/enterprise/frontend/src/embedding/data-picker/SimpleDataPicker/SimpleDataPickerView.tsx b/enterprise/frontend/src/embedding/data-picker/SimpleDataPicker/SimpleDataPickerView.tsxindex 5ac9e5f0846..9aded66ede3 100644--- a/enterprise/frontend/src/embedding/data-picker/SimpleDataPicker/SimpleDataPickerView.tsx+++ b/enterprise/frontend/src/embedding/data-picker/SimpleDataPicker/SimpleDataPickerView.tsx@@ -72,19 +72,13 @@ export function SimpleDataPickerView({{displayOptions.map((option) => {const isSelected = selectedEntity === option.id;const iconColor = isSelected- ? "--mb-color-text-white"- : "--mb-color-icon-primary";+ ? "text-primary-inverse"+ : "icon-primary";return (<NavLinkkey={option.id}active={selectedEntity === option.id}- leftSection={- <Icon- color={`var(${iconColor})`}- name="table"- aria-hidden- />- }+ leftSection={<Icon c={iconColor} name="table" aria-hidden />}label={option.name}onClick={() => onClick(option.id)}variant="default"diff --git a/enterprise/frontend/src/embedding/data-picker/saved-entity-picker/SavedEntityPicker.module.css b/enterprise/frontend/src/embedding/data-picker/saved-entity-picker/SavedEntityPicker.module.cssindex eb2d6662626..f0f59fdbf7b 100644--- a/enterprise/frontend/src/embedding/data-picker/saved-entity-picker/SavedEntityPicker.module.css+++ b/enterprise/frontend/src/embedding/data-picker/saved-entity-picker/SavedEntityPicker.module.css@@ -15,7 +15,7 @@display: flex;flex-direction: column;min-width: 310px;- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);overflow: auto;@media screen and (max-width: 40em) {@@ -29,7 +29,7 @@font-size: 16px;display: flex;align-items: center;- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);border-bottom: 1px solid var(--mb-color-border);padding: 1rem;diff --git a/enterprise/frontend/src/metabase-enterprise/ai-entity-analysis/components/AIAnalysisContentWrapper/AIAnalysisContentWrapper.tsx b/enterprise/frontend/src/metabase-enterprise/ai-entity-analysis/components/AIAnalysisContentWrapper/AIAnalysisContentWrapper.tsxindex dd3cf46cf73..39f6120f785 100644--- a/enterprise/frontend/src/metabase-enterprise/ai-entity-analysis/components/AIAnalysisContentWrapper/AIAnalysisContentWrapper.tsx+++ b/enterprise/frontend/src/metabase-enterprise/ai-entity-analysis/components/AIAnalysisContentWrapper/AIAnalysisContentWrapper.tsx@@ -32,7 +32,7 @@ export function AIAnalysisContentWrapper({<CopyButtonvalue={explanation}aria-label={t`Copy`}- style={{ color: "var(--mb-color-text-medium)" }}+ style={{ color: "var(--mb-color-text-secondary)" }}/>)}{onClose && (@@ -42,7 +42,7 @@ export function AIAnalysisContentWrapper({p={4}onClick={onClose}aria-label={t`Close`}- color="text-medium"+ c="text-secondary"><Icon name="close" size={16} /></Button>diff --git a/enterprise/frontend/src/metabase-enterprise/ai-entity-analysis/components/AIQuestionAnalysisSidebar/AIQuestionAnalysisSidebar.tsx b/enterprise/frontend/src/metabase-enterprise/ai-entity-analysis/components/AIQuestionAnalysisSidebar/AIQuestionAnalysisSidebar.tsxindex 843b6a6e53a..6978caedf6c 100644--- a/enterprise/frontend/src/metabase-enterprise/ai-entity-analysis/components/AIQuestionAnalysisSidebar/AIQuestionAnalysisSidebar.tsx+++ b/enterprise/frontend/src/metabase-enterprise/ai-entity-analysis/components/AIQuestionAnalysisSidebar/AIQuestionAnalysisSidebar.tsx@@ -99,7 +99,7 @@ export function AIQuestionAnalysisSidebar({return (<CopyButtonvalue={analysisData.summary}- style={{ color: "var(--mb-color-text-medium)" }}+ style={{ color: "var(--mb-color-text-secondary)" }}aria-label={t`Copy`}/>);diff --git a/enterprise/frontend/src/metabase-enterprise/auth/components/SettingsSAMLForm/SettingsSAMLForm.tsx b/enterprise/frontend/src/metabase-enterprise/auth/components/SettingsSAMLForm/SettingsSAMLForm.tsxindex 68f01c7ef30..09af05756cb 100644--- a/enterprise/frontend/src/metabase-enterprise/auth/components/SettingsSAMLForm/SettingsSAMLForm.tsx+++ b/enterprise/frontend/src/metabase-enterprise/auth/components/SettingsSAMLForm/SettingsSAMLForm.tsx@@ -101,7 +101,7 @@ export function SettingsSAMLForm() {{({ dirty }) => (<Form><Title order={2}>{t`Set up SAML-based SSO`}</Title>- <Text c="text-medium" mb="xl">+ <Text c="text-secondary" mb="xl">{jt`Use the settings below to configure your SSO via SAML. If you have any questions, check out our ${(<ExternalLinkkey="link"@@ -110,7 +110,7 @@ export function SettingsSAMLForm() {)}.`}</Text><FormSection title={t`Configure your identity provider (IdP)`}>- <Text c="text-medium" mb="xl">+ <Text c="text-secondary" mb="xl">{/* eslint-disable-next-line no-literal-metabase-strings -- Metabase settings */}{t`Your identity provider will need the following info about Metabase.`}</Text>@@ -123,7 +123,7 @@ export function SettingsSAMLForm() {/><Title order={4} mt="xl">{t`SAML attributes`}</Title>- <Text c="text-medium" mb="md">+ <Text c="text-secondary" mb="md">{t`In most IdPs, you'll need to put each of these in an input box labeled "Name" in the attribute statements section.`}</Text>@@ -169,7 +169,7 @@ export function SettingsSAMLForm() {// eslint-disable-next-line no-literal-metabase-strings -- Metabase settingstitle={t`Tell Metabase about your identity provider`}>- <Text mb="xl" mt="sm" c="text-medium">+ <Text mb="xl" mt="sm" c="text-secondary">{/* eslint-disable-next-line no-literal-metabase-strings -- Metabase settings */}{t`Metabase will need the following info about your provider.`}</Text>@@ -244,7 +244,7 @@ export function SettingsSAMLForm() {<FormSectiontitle={t`Synchronize group membership with your SSO`}>- <Text c="text-medium" mb="lg">+ <Text c="text-secondary" mb="lg">{/* eslint-disable-next-line no-literal-metabase-strings -- Metabase settings */}{t`To enable this, you'll need to create mappings to tell Metabase which group(s) your users shouldbe added to based on the SSO group they're in.`}diff --git a/enterprise/frontend/src/metabase-enterprise/caching/components/StrategyEditorForQuestionsAndDashboards/StrategyEditorForQuestionsAndDashboards.module.css b/enterprise/frontend/src/metabase-enterprise/caching/components/StrategyEditorForQuestionsAndDashboards/StrategyEditorForQuestionsAndDashboards.module.cssindex ffdbcdddaf1..4c2a891e02b 100644--- a/enterprise/frontend/src/metabase-enterprise/caching/components/StrategyEditorForQuestionsAndDashboards/StrategyEditorForQuestionsAndDashboards.module.css+++ b/enterprise/frontend/src/metabase-enterprise/caching/components/StrategyEditorForQuestionsAndDashboards/StrategyEditorForQuestionsAndDashboards.module.css@@ -12,7 +12,7 @@.CacheableItemTable {table-layout: fixed;- background-color: var(--mb-color-text-white);+ background-color: var(--mb-color-text-primary-inverse);col {width: 30%;diff --git a/enterprise/frontend/src/metabase-enterprise/caching/components/StrategyEditorForQuestionsAndDashboards/StrategyEditorForQuestionsAndDashboards.tsx b/enterprise/frontend/src/metabase-enterprise/caching/components/StrategyEditorForQuestionsAndDashboards/StrategyEditorForQuestionsAndDashboards.tsxindex d5cc7704b96..aeaddc841ca 100644--- a/enterprise/frontend/src/metabase-enterprise/caching/components/StrategyEditorForQuestionsAndDashboards/StrategyEditorForQuestionsAndDashboards.tsx+++ b/enterprise/frontend/src/metabase-enterprise/caching/components/StrategyEditorForQuestionsAndDashboards/StrategyEditorForQuestionsAndDashboards.tsx@@ -315,7 +315,7 @@ const TableSkeleton = ({ columns }: { columns: ColumnItem[] }) => ();const NoResultsTableRow = () => (- <Center fw="bold" c="text-light">+ <Center fw="bold" c="text-tertiary">{t`No dashboards or questions have their own caching policies yet.`}</Center>);diff --git a/enterprise/frontend/src/metabase-enterprise/caching/components/StrategyFormLauncher.styled.tsx b/enterprise/frontend/src/metabase-enterprise/caching/components/StrategyFormLauncher.styled.tsxindex e0446d690a8..04f06a23242 100644--- a/enterprise/frontend/src/metabase-enterprise/caching/components/StrategyFormLauncher.styled.tsx+++ b/enterprise/frontend/src/metabase-enterprise/caching/components/StrategyFormLauncher.styled.tsx@@ -59,7 +59,9 @@ export const StyledLauncher = styled.div<font-weight: ${({ forRoot, inheritsRootStrategy }) =>forRoot || inheritsRootStrategy ? "normal" : "bold"};background-color: ${({ forRoot }) =>- forRoot ? "var(--mb-color-bg-medium" : "var(--mb-color-bg-white"};+ forRoot+ ? "var(--mb-color-background-tertiary)"+ : "var(--mb-color-background-primary)"};${({ forRoot }) =>!forRoot &&css`diff --git a/enterprise/frontend/src/metabase-enterprise/caching/components/StrategyFormLauncher.tsx b/enterprise/frontend/src/metabase-enterprise/caching/components/StrategyFormLauncher.tsxindex 447e777f325..6b0b9b8551c 100644--- a/enterprise/frontend/src/metabase-enterprise/caching/components/StrategyFormLauncher.tsx+++ b/enterprise/frontend/src/metabase-enterprise/caching/components/StrategyFormLauncher.tsx@@ -76,8 +76,8 @@ export const StrategyFormLauncher = ({shouldDisableTooltip ? "" : "-with-tooltip"}`}>- <Flex gap="0.5rem" color="text-medium" align="center">- <FixedSizeIcon name={forRoot ? "star" : "database"} color="inherit" />+ <Flex gap="0.5rem" c="text-secondary" align="center">+ <FixedSizeIcon name={forRoot ? "star" : "database"} c="inherit" /><Title c="inherit" order={6}>{title}</Title>diff --git a/enterprise/frontend/src/metabase-enterprise/caching/components/StrategyFormLauncherPanel.tsx b/enterprise/frontend/src/metabase-enterprise/caching/components/StrategyFormLauncherPanel.tsxindex 3635f27ae36..046f127e150 100644--- a/enterprise/frontend/src/metabase-enterprise/caching/components/StrategyFormLauncherPanel.tsx+++ b/enterprise/frontend/src/metabase-enterprise/caching/components/StrategyFormLauncherPanel.tsx@@ -47,7 +47,10 @@ export const StrategyFormLauncherPanel = ({});return (- <Panel role="group" style={{ backgroundColor: "var(--mb-color-bg-light)" }}>+ <Panel+ role="group"+ style={{ backgroundColor: "var(--mb-color-background-secondary)" }}+ ><StrategyFormLauncherPanelBox><StrategyFormLauncherforId={rootId}diff --git a/enterprise/frontend/src/metabase-enterprise/clean_up/CleanupCollectionModal/CleanupCollectionModal.module.css b/enterprise/frontend/src/metabase-enterprise/clean_up/CleanupCollectionModal/CleanupCollectionModal.module.cssindex c87286c8f07..dd599db57ee 100644--- a/enterprise/frontend/src/metabase-enterprise/clean_up/CleanupCollectionModal/CleanupCollectionModal.module.css+++ b/enterprise/frontend/src/metabase-enterprise/clean_up/CleanupCollectionModal/CleanupCollectionModal.module.css@@ -15,7 +15,7 @@}.modalFooter {- background: var(--mb-color-bg-white);+ background: var(--mb-color-background-primary);position: sticky;bottom: 0;}diff --git a/enterprise/frontend/src/metabase-enterprise/clean_up/CleanupCollectionModal/CleanupCollectionTable.tsx b/enterprise/frontend/src/metabase-enterprise/clean_up/CleanupCollectionModal/CleanupCollectionTable.tsxindex 1ffb6dc8112..28827deb406 100644--- a/enterprise/frontend/src/metabase-enterprise/clean_up/CleanupCollectionModal/CleanupCollectionTable.tsx+++ b/enterprise/frontend/src/metabase-enterprise/clean_up/CleanupCollectionModal/CleanupCollectionTable.tsx@@ -106,10 +106,7 @@ export const CleanupCollectionTable = ({{/* Name */}<ItemCell data-testid="clean-up-table-collection"><Flex align="center" gap="sm">- <FixedSizeIcon- name={getIcon(item).name}- color="var(--mb-color-brand)"- />+ <FixedSizeIcon name={getIcon(item).name} c="brand" /><Ellipsified>{item.name}</Ellipsified></Flex></ItemCell>diff --git a/enterprise/frontend/src/metabase-enterprise/collections/components/CollectionAuthorityLevelDisplay.tsx b/enterprise/frontend/src/metabase-enterprise/collections/components/CollectionAuthorityLevelDisplay.tsxindex 294711b94a6..c00958b5115 100644--- a/enterprise/frontend/src/metabase-enterprise/collections/components/CollectionAuthorityLevelDisplay.tsx+++ b/enterprise/frontend/src/metabase-enterprise/collections/components/CollectionAuthorityLevelDisplay.tsx@@ -4,7 +4,6 @@ import { t } from "ttag";import type { ObjectWithModel } from "metabase/lib/icon";import { PLUGIN_COLLECTIONS } from "metabase/plugins";import { Group, Icon, Text } from "metabase/ui";-import { color } from "metabase/ui/utils/colors";import type { Collection } from "metabase-types/api";export const CollectionAuthorityLevelDisplay = ({@@ -17,7 +16,7 @@ export const CollectionAuthorityLevelDisplay = ({...collection,model: "collection",} as ObjectWithModel);- return { ...icon, color: icon.color && color(icon.color) };+ return icon;}, [collection]);if (collection.authority_level !== "official") {diff --git a/enterprise/frontend/src/metabase-enterprise/collections/components/CollectionAuthorityLevelIcon.tsx b/enterprise/frontend/src/metabase-enterprise/collections/components/CollectionAuthorityLevelIcon.tsxindex 33f54945b88..a01952a617b 100644--- a/enterprise/frontend/src/metabase-enterprise/collections/components/CollectionAuthorityLevelIcon.tsx+++ b/enterprise/frontend/src/metabase-enterprise/collections/components/CollectionAuthorityLevelIcon.tsx@@ -12,7 +12,7 @@ export const CollectionAuthorityLevelIcon: CollectionAuthorityLevelIconComponent}const level = AUTHORITY_LEVELS[String(collection.authority_level)];const levelColor = level.color ? color(level.color) : undefined;- const iconColor = archived ? color("text-light") : levelColor;+ const iconColor = archived ? color("text-tertiary") : levelColor;return (<Icon{...iconProps}diff --git a/enterprise/frontend/src/metabase-enterprise/collections/constants.ts b/enterprise/frontend/src/metabase-enterprise/collections/constants.tsindex 5b53d1d0074..b87a5a3ba17 100644--- a/enterprise/frontend/src/metabase-enterprise/collections/constants.ts+++ b/enterprise/frontend/src/metabase-enterprise/collections/constants.ts@@ -23,7 +23,7 @@ export const OFFICIAL_COLLECTION: CollectionAuthorityLevelConfig = {// eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045name: t`Official`,icon: "official_collection",- color: "saturated-yellow",+ color: "saturated-yellow" as const,tooltips: {// eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045default: t`Official collection`,diff --git a/enterprise/frontend/src/metabase-enterprise/content_verification/VerifiedFilter/VerifiedToggle.tsx b/enterprise/frontend/src/metabase-enterprise/content_verification/VerifiedFilter/VerifiedToggle.tsxindex 7dbbece1660..dfb4d36bd66 100644--- a/enterprise/frontend/src/metabase-enterprise/content_verification/VerifiedFilter/VerifiedToggle.tsx+++ b/enterprise/frontend/src/metabase-enterprise/content_verification/VerifiedFilter/VerifiedToggle.tsx@@ -21,7 +21,7 @@ export const VerifiedToggle = ({role="switch"variant="viewHeader"onClick={() => handleVerifiedFilterChange(!verified)}- c={verified ? "brand" : "text-dark"}+ c={verified ? "brand" : "text-primary"}><Icon name="verified" /></ActionIcon>diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/components/SectionLayout/SectionLayout.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/app/components/SectionLayout/SectionLayout.tsxindex 571ffdcc29f..90aa0e468e5 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/components/SectionLayout/SectionLayout.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/components/SectionLayout/SectionLayout.tsx@@ -9,7 +9,7 @@ type SectionLayoutProps = {export function SectionLayout({ children }: SectionLayoutProps) {return (- <Stack h="100%" gap={0} bg="bg-light">+ <Stack h="100%" gap={0} bg="background-secondary"><Flex flex={1} mih={0} miw={0}><Stack flex={1} miw={0} gap={0}>{children}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/LibrarySectionLayout.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/LibrarySectionLayout.tsxindex 36b6d08fbf8..750d1c96726 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/LibrarySectionLayout.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/app/pages/LibrarySectionLayout/LibrarySectionLayout.tsx@@ -210,7 +210,7 @@ export function LibrarySectionLayout() {py={0}/><Stack- bg="background-light"+ bg="background-secondary"data-testid="library-page"pb="2rem"px="3.5rem"@@ -288,7 +288,7 @@ const RootSnippetsCollectionMenu = ({<Buttonw={24}h={24}- c="text-medium"+ c="text-secondary"size="compact-xs"variant="subtle"leftSection={<FixedSizeIcon name="ellipsis" size={16} />}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/EntityList/EntityListItem.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/EntityList/EntityListItem.tsxindex 11f60610bcf..48957e607f9 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/EntityList/EntityListItem.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/EntityList/EntityListItem.tsx@@ -1,6 +1,7 @@import { Link } from "react-router";import { Ellipsified } from "metabase/common/components/Ellipsified";+import type { ColorName } from "metabase/lib/colors/types";import type { IconName } from "metabase/ui";import { Card, Flex, Icon, Stack, Text } from "metabase/ui";@@ -10,7 +11,7 @@ type EntityListItemProps = {name: string;description?: string | null;icon: IconName;- iconColor?: string;+ iconColor?: ColorName;href: string;};diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/OverviewVisualization/OverviewVisualization.module.css b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/OverviewVisualization/OverviewVisualization.module.cssindex ff393eb57d5..11011b2e2eb 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/OverviewVisualization/OverviewVisualization.module.css+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/OverviewVisualization/OverviewVisualization.module.css@@ -3,7 +3,7 @@}.visualization {- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);border: 1px solid var(--mb-color-border);border-radius: var(--default-border-radius);overflow: hidden;diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/PageContainer/PageContainer.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/PageContainer/PageContainer.tsxindex 0dc1187a565..4e57e6a5fc1 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/PageContainer/PageContainer.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/PageContainer/PageContainer.tsx@@ -8,7 +8,7 @@ export const PageContainer = React.forwardRef(function PageContainerInner() {return (<Stack- bg="background-light"+ bg="background-secondary"h="100%"pb="2rem"px="3.5rem"diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/PaneHeader/PaneHeader.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/PaneHeader/PaneHeader.tsxindex f0b8b313300..836b59bd846 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/PaneHeader/PaneHeader.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/PaneHeader/PaneHeader.tsx@@ -135,7 +135,9 @@ type PaneHeaderTabsProps = {export function PaneHeaderTabs({ tabs, withBackground }: PaneHeaderTabsProps) {const { pathname } = useSelector(getLocation);- const backgroundColor = withBackground ? "bg-secondary" : "transparent";+ const backgroundColor = withBackground+ ? "background-secondary"+ : "transparent";return (<Group gap="sm">diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/Table/Table.module.css b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/Table/Table.module.cssindex bae786b8bbd..e280f5f39c2 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/Table/Table.module.css+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/common/components/Table/Table.module.css@@ -2,7 +2,7 @@display: flex;width: 100%;border-bottom: 1px solid var(--mb-color-border);- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);padding-top: 0.75rem;padding-bottom: 0.75rem;padding-right: 1rem;diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/components/RevisionHistory/ClausePill.module.css b/enterprise/frontend/src/metabase-enterprise/data-studio/components/RevisionHistory/ClausePill.module.cssindex e6d0094bdf5..2b45a37d9cf 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/components/RevisionHistory/ClausePill.module.css+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/components/RevisionHistory/ClausePill.module.css@@ -6,7 +6,7 @@}.aggregation {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);background-color: var(--mb-color-summarize);border-radius: 1rem;overflow-wrap: anywhere;diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/components/RevisionHistory/RevisionDiff.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/components/RevisionHistory/RevisionDiff.tsxindex f3a607c8a1d..159ad112064 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/components/RevisionHistory/RevisionDiff.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/components/RevisionHistory/RevisionDiff.tsx@@ -35,7 +35,7 @@ export function RevisionDiff({const label = getPropertyLabel(property, definitionLabel);return (- <Box p="md" bg="bg-light" bd="1px solid border">+ <Box p="md" bg="background-secondary" bd="1px solid border"><Flex align="center" gap="sm" mb="sm"><DiffIcon before={before} after={after} /><Text size="sm" fw={400} c="text-secondary">diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/EmptyState.module.css b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/EmptyState.module.cssindex 44a13de2ba6..4c634557986 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/EmptyState.module.css+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/EmptyState.module.css@@ -3,6 +3,6 @@}.empyIcon {- background-color: var(--mb-color-bg-medium);+ background-color: var(--mb-color-background-tertiary);border-radius: 100%;}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/SearchNew.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/SearchNew.tsxindex 1406771955a..5751caa3fa2 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/SearchNew.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TablePicker/components/SearchNew.tsx@@ -157,7 +157,7 @@ export function SearchNew({if (filteredTables.length === 0) {return (<Box p="xl">- <Text c="text.2">{t`No tables found`}</Text>+ <Text c="text-tertiary">{t`No tables found`}</Text></Box>);}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableAttributesEditBulk.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableAttributesEditBulk.tsxindex 7f700786b1a..a237187409f 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableAttributesEditBulk.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableAttributesEditBulk.tsx@@ -134,7 +134,7 @@ export function TableAttributesEditBulk({<Stack gap="md"><Groupalign="center"- c="text-light"+ c="text-tertiary"gap={10}flex="1"fs="lg"@@ -146,7 +146,7 @@ export function TableAttributesEditBulk({><Titleorder={4}- c="text-dark"+ c="text-primary"style={{ display: "flex", alignItems: "center", gap: "0.5rem" }}><Icon name="collection2" size={20} />diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableSection.module.css b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableSection.module.cssindex 31bf3150c4f..65137901cb6 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableSection.module.css+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/components/TableSection/TableSection.module.css@@ -5,6 +5,6 @@.box {border-radius: var(--mantine-radius-md);padding: var(--mantine-spacing-md);- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);border: 1px solid var(--mb-color-border);}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/DataModel.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/DataModel.tsxindex dac388ca999..b70d7d59320 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/DataModel.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/DataModel.tsx@@ -175,7 +175,7 @@ function DataModelContent({ params }: Props) {return (<Flex- bg="bg-light"+ bg="background-secondary"data-testid="data-model"h="100%"style={{ overflow: "auto" }}@@ -248,7 +248,7 @@ function DataModelContent({ params }: Props) {w="100%"data-testid="table-section-header"py="lg"- bg="bg-light"+ bg="background-secondary"className={S.header}px="lg">@@ -259,7 +259,7 @@ function DataModelContent({ params }: Props) {databaseId: table?.db_id,schemaName: table?.schema,})}- leftSection={<Icon name="close" c="text-medium" />}+ leftSection={<Icon name="close" c="text-secondary" />}variant="subtle"p="sm"size="compact-sm"@@ -308,7 +308,7 @@ function DataModelContent({ params }: Props) {w="100%"data-testid="field-section-header"p="lg"- bg="bg-light"+ bg="background-secondary"className={S.header}><DataStudioBreadcrumbs>{t`Field details`}</DataStudioBreadcrumbs>@@ -319,7 +319,7 @@ function DataModelContent({ params }: Props) {schemaName: table?.schema,tableId: table?.id,})}- leftSection={<Icon name="close" c="text-medium" />}+ leftSection={<Icon name="close" c="text-secondary" />}variant="subtle"size="compact-sm"onClick={closePreview}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/EditSnippetPage/EditSnippetPage.module.css b/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/EditSnippetPage/EditSnippetPage.module.cssindex a0a44e25ddc..db2ed3cffd7 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/EditSnippetPage/EditSnippetPage.module.css+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/EditSnippetPage/EditSnippetPage.module.css@@ -4,7 +4,7 @@.editor {height: 100%;- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);}.sidebar {diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/NewSnippetPage/NewSnippetPage.module.css b/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/NewSnippetPage/NewSnippetPage.module.cssindex 034969908b0..cf05e6ee8e5 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/NewSnippetPage/NewSnippetPage.module.css+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/snippets/pages/NewSnippetPage/NewSnippetPage.module.css@@ -1,4 +1,4 @@.editor {height: 100%;- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);}diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableFieldsPage/TableFieldsPage.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableFieldsPage/TableFieldsPage.tsxindex c95a012aed9..c792a4dc6c0 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableFieldsPage/TableFieldsPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/tables/pages/TableFieldsPage/TableFieldsPage.tsx@@ -108,14 +108,14 @@ export function TableFieldsPage({ params }: TableFieldsPageProps) {pos="sticky"top={0}className={S.header}- bg="bg-light"+ bg="background-secondary"><Text fw="bold">{t`Field Details`}</Text><Buttoncomponent={ForwardRefLink}to={Urls.dataStudioTableFields(table.id)}onClick={closePreview}- leftSection={<Icon name="close" c="text-medium" />}+ leftSection={<Icon name="close" c="text-secondary" />}variant="subtle"size="compact-sm"p="sm"diff --git a/enterprise/frontend/src/metabase-enterprise/database_replication/DatabaseReplicationForm.tsx b/enterprise/frontend/src/metabase-enterprise/database_replication/DatabaseReplicationForm.tsxindex fdfa0a80bf6..410d2d0b32c 100644--- a/enterprise/frontend/src/metabase-enterprise/database_replication/DatabaseReplicationForm.tsx+++ b/enterprise/frontend/src/metabase-enterprise/database_replication/DatabaseReplicationForm.tsx@@ -201,12 +201,7 @@ export const DatabaseReplicationForm = ({</Box>)}- <Card- radius="md"- bg="var(--mb-color-bg-light)"- p={0}- shadow="none"- >+ <Card radius="md" bg="background-secondary" p={0} shadow="none"><Flexalign="flex-start"direction="row"@@ -272,16 +267,16 @@ export const DatabaseReplicationForm = ({<Text fz="md"><Textspan- c="text-dark"+ c="text-primary"display="inline"fw="500">{table.tableSchema}</Text>- <Text span c="text-medium" display="inline">+ <Text span c="text-secondary" display="inline">.{table.tableName}</Text>{" "}- <Text span c="text-light" display="inline">+ <Text span c="text-tertiary" display="inline">{noSyncReason(table)}</Text></Text>@@ -293,12 +288,7 @@ export const DatabaseReplicationForm = ({)}</Card>- <Card- radius="md"- bg="var(--mb-color-bg-light)"- p={0}- shadow="none"- >+ <Card radius="md" bg="background-secondary" p={0} shadow="none"><Flexalign="flex-start"direction="row"@@ -367,13 +357,13 @@ export const DatabaseReplicationForm = ({<Text fz="md"><Textspan- c="text-dark"+ c="text-primary"display="inline"fw="500">{table.tableSchema}</Text>- <Text span c="text-medium" display="inline">+ <Text span c="text-secondary" display="inline">.{table.tableName}</Text></Text>@@ -387,7 +377,7 @@ export const DatabaseReplicationForm = ({<Cardradius="md"- bg="var(--mb-color-bg-light)"+ bg="background-secondary"p="md"my="sm"shadow="none"@@ -395,7 +385,7 @@ export const DatabaseReplicationForm = ({<Stack><Group justify="space-between"><Box ta="left">- <Text c="text-light">{database.name}</Text>+ <Text c="text-tertiary">{database.name}</Text>{!previewResponseLoading &&typeof previewResponse?.totalEstimatedRowCount ==="number" ? (@@ -410,7 +400,7 @@ export const DatabaseReplicationForm = ({{previewResponseLoading && <Loader />}<Box ta="right">- <Text c="text-light">{t`Available Cloud Storage`}</Text>+ <Text c="text-tertiary">{t`Available Cloud Storage`}</Text>{!previewResponseLoading &&typeof previewResponse?.freeQuota === "number" ? (<Text fw="bold" w="100%">diff --git a/enterprise/frontend/src/metabase-enterprise/database_replication/DatabaseReplicationPostgresInfo.tsx b/enterprise/frontend/src/metabase-enterprise/database_replication/DatabaseReplicationPostgresInfo.tsxindex 300ea971c39..c8dd94197f7 100644--- a/enterprise/frontend/src/metabase-enterprise/database_replication/DatabaseReplicationPostgresInfo.tsx+++ b/enterprise/frontend/src/metabase-enterprise/database_replication/DatabaseReplicationPostgresInfo.tsx@@ -14,7 +14,7 @@ export function DatabaseReplicationPostgresInfo() {);return (- <Text size="md" c="text-medium">+ <Text size="md" c="text-secondary">{jt`Note: You may need to ${link} in the source database. The process might also require a database restart.`}</Text>);diff --git a/enterprise/frontend/src/metabase-enterprise/database_replication/DatabaseReplicationStatusInfo.tsx b/enterprise/frontend/src/metabase-enterprise/database_replication/DatabaseReplicationStatusInfo.tsxindex eb3432a1a96..04e4b596641 100644--- a/enterprise/frontend/src/metabase-enterprise/database_replication/DatabaseReplicationStatusInfo.tsx+++ b/enterprise/frontend/src/metabase-enterprise/database_replication/DatabaseReplicationStatusInfo.tsx@@ -21,7 +21,7 @@ export const DatabaseReplicationStatusInfo = memo(t`Replicating to Metabase Cloud Storage`: // eslint-disable-next-line no-literal-metabase-strings -- This string only shows for admins.t`Not replicating to Metabase Cloud Storage`;- const color = hasConnection ? "success" : "text-light";+ const color = hasConnection ? "success" : "text-tertiary";return (<Flex align="center" gap="sm" {...flexProps}>diff --git a/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabaseConnectionModal/DestinationDatabaseConnectionModal.tsx b/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabaseConnectionModal/DestinationDatabaseConnectionModal.tsxindex 8435a9be0c2..34514f3c8a2 100644--- a/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabaseConnectionModal/DestinationDatabaseConnectionModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/database_routing/DestinationDatabaseConnectionModal/DestinationDatabaseConnectionModal.tsx@@ -119,7 +119,7 @@ export const DestinationDatabaseConnectionModal = ({px="md"mx="xl"my="md"- bg="accent-gray-light"+ bg="background-secondary"align="center"justify="space-between"bd="1px solid border"diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/CheckDependenciesForm/CheckDependenciesForm.module.css b/enterprise/frontend/src/metabase-enterprise/dependencies/components/CheckDependenciesForm/CheckDependenciesForm.module.cssindex de3cba6c740..efc2e2a8fa4 100644--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/CheckDependenciesForm/CheckDependenciesForm.module.css+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/CheckDependenciesForm/CheckDependenciesForm.module.css@@ -2,7 +2,7 @@flex-shrink: 0;&:hover {- background-color: var(--mb-color-background-light);+ background-color: var(--mb-color-background-secondary);}}diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelHeader/PanelHeader.tsx b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelHeader/PanelHeader.tsxindex ec3df58aa26..52058c3c850 100644--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelHeader/PanelHeader.tsx+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphInfoPanel/PanelHeader/PanelHeader.tsx@@ -34,7 +34,7 @@ export function PanelHeader({ node, onClose }: PanelHeaderProps) {return (<Group className={S.root} p="lg" gap="0.75rem" wrap="nowrap">- <Center w="2.75rem" h="2.75rem" bdrs="50%" bg="bg-secondary">+ <Center w="2.75rem" h="2.75rem" bdrs="50%" bg="background-secondary"><FixedSizeIcon name={getNodeIcon(node)} c="brand" size={20} /></Center><Stack gap="xs" flex={1}>diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphNode/GraphNode.module.css b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphNode/GraphNode.module.cssindex b30b12989f5..f050b3e5343 100644--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphNode/GraphNode.module.css+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/GraphNode/GraphNode.module.css@@ -18,7 +18,7 @@.pill {color: var(--mb-color-text-primary);- background-color: var(--mb-color-bg-medium);+ background-color: var(--mb-color-background-tertiary);&:hover,&.selected {diff --git a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/types.ts b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/types.tsindex abb31a0c5bf..2cff342fb62 100644--- a/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/types.ts+++ b/enterprise/frontend/src/metabase-enterprise/dependencies/components/DependencyGraph/types.ts@@ -1,5 +1,6 @@import type { Edge, Node } from "@xyflow/react";+import type { ColorName } from "metabase/lib/colors/types";import type {DependencyGroupType,DependencyId,@@ -13,7 +14,7 @@ export type NodeType = Node<DependencyNode>;export type NodeTypeInfo = {label: string;- color: string;+ color: ColorName;};export type NodeLink = {diff --git a/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveAddDataPanel.tsx b/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveAddDataPanel.tsxindex 3cbbccb2a9c..4f1fb943277 100644--- a/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveAddDataPanel.tsx+++ b/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveAddDataPanel.tsx@@ -57,7 +57,7 @@ const PanelWrapper = ({<Title order={2} size="h4" mb="sm">{title}</Title>- <Text c="text-medium">{subtitle}</Text>+ <Text c="text-secondary">{subtitle}</Text></Box>{children}</Stack>@@ -308,7 +308,7 @@ const ErrorAlert = ({},label: {fontSize: "var(--mantine-font-size-md)",- color: "var(--mb-color-text-dark)",+ color: "var(--mb-color-text-primary)",},}}>diff --git a/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveConnectionModal.tsx b/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveConnectionModal.tsxindex 134da787bb5..0aa841b3979 100644--- a/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveConnectionModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveConnectionModal.tsx@@ -141,7 +141,7 @@ function GoogleSheetsConnectModal({fullWidthautoContrastcolor="brand"- c="var(--mb-color-text-white)"+ c="text-primary-inverse"value={linkType}onChange={setLinkType}data={@@ -152,7 +152,7 @@ function GoogleSheetsConnectModal({}/><Flex- bg="bg-light"+ bg="background-secondary"style={{ borderRadius: "0.5rem" }}p="md"direction="column"@@ -194,7 +194,7 @@ function GoogleSheetsConnectModal({: "https://docs.google.com/spreadsheets/d/abc123-xyz456"}/>- <Text size="sm" color="secondary">+ <Text size="sm" c="text-secondary">{copyInstruction}</Text></Box>@@ -240,7 +240,7 @@ function GoogleSheetsDisconnectModal({<ModalWrapper onClose={onClose} title={title}><Stack gap="md"><DriveConnectionDisplay />- <Text c="text-medium" pb="md">+ <Text c="text-secondary" pb="md">{bodyCopy}</Text><Flex w="100%" gap="sm" justify="space-between">@@ -303,7 +303,7 @@ export const DriveConnectionDisplay = () => {return (<MaybeLink href={folderUrl ?? ""}><Flex- bg="bg-light"+ bg="background-secondary"w="100%"gap="sm"p="md"@@ -313,7 +313,7 @@ export const DriveConnectionDisplay = () => {<Box><Text fw="bold">{t`Google Drive connected`}</Text>{!!userName && (- <Text c="text-medium" fz="sm" lh="140%">+ <Text c="text-secondary" fz="sm" lh="140%">{t`Connected by ${userName} ${relativeConnectionTime}`}</Text>)}diff --git a/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveErrorMenuItem.tsx b/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveErrorMenuItem.tsxindex eaa0adff4bd..cb55794b6ed 100644--- a/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveErrorMenuItem.tsx+++ b/enterprise/frontend/src/metabase-enterprise/google_drive/GdriveErrorMenuItem.tsx@@ -15,7 +15,7 @@ export function GdriveErrorMenuItem({ error }: { error: any }) {<Icon name="warning" c="error" mt="xs" mr="sm" /><Box><Text fw="bold">{t`Couldn't sync Google Sheets`}</Text>- <Text size="sm" c="text-medium" maw="16rem">+ <Text size="sm" c="text-secondary" maw="16rem">{getErrorMessage(error,// eslint-disable-next-line no-literal-metabase-strings -- admin only uidiff --git a/enterprise/frontend/src/metabase-enterprise/google_drive/PausedModal.tsx b/enterprise/frontend/src/metabase-enterprise/google_drive/PausedModal.tsxindex 5d704e26f59..8d548fedc12 100644--- a/enterprise/frontend/src/metabase-enterprise/google_drive/PausedModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/google_drive/PausedModal.tsx@@ -21,7 +21,7 @@ function PausedModal({ onClose }: { onClose: () => void }) {<Text size="lg" fw="bold">{t`Couldn't upload the file, storage is full`}</Text>- <Text c="text-medium">+ <Text c="text-secondary">{isAdmin? // eslint-disable-next-line no-literal-metabase-strings -- admin onlyt`Add more storage to your Metabase or connect a database to store the uploaded files.`diff --git a/enterprise/frontend/src/metabase-enterprise/group_managers/components/UserTypeCell/UserTypeCell.styled.tsx b/enterprise/frontend/src/metabase-enterprise/group_managers/components/UserTypeCell/UserTypeCell.styled.tsxindex 41a6f2c57d9..5abc41830dc 100644--- a/enterprise/frontend/src/metabase-enterprise/group_managers/components/UserTypeCell/UserTypeCell.styled.tsx+++ b/enterprise/frontend/src/metabase-enterprise/group_managers/components/UserTypeCell/UserTypeCell.styled.tsx@@ -11,7 +11,7 @@ export const UserTypeCellRoot = styled.td`text-transform: capitalize;font-size: 14px;font-weight: bold;- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);${ChangeTypeButton} {visibility: hidden;diff --git a/enterprise/frontend/src/metabase-enterprise/license/components/BillingInfo/BillingInfo.styled.tsx b/enterprise/frontend/src/metabase-enterprise/license/components/BillingInfo/BillingInfo.styled.tsxindex 07d690cfd68..9e9cc71c173 100644--- a/enterprise/frontend/src/metabase-enterprise/license/components/BillingInfo/BillingInfo.styled.tsx+++ b/enterprise/frontend/src/metabase-enterprise/license/components/BillingInfo/BillingInfo.styled.tsx@@ -16,7 +16,7 @@ export const BillingInfoRowContainer = styled.div<{ extraPadding?: boolean }>`align-items: center;&:not(:last-child) {- border-bottom: 1px solid var(--mb-color-bg-medium);+ border-bottom: 1px solid var(--mb-color-background-tertiary);}`;diff --git a/enterprise/frontend/src/metabase-enterprise/license/components/BillingInfo/BillingInfo.tsx b/enterprise/frontend/src/metabase-enterprise/license/components/BillingInfo/BillingInfo.tsxindex 8efa801be18..b3967d7f728 100644--- a/enterprise/frontend/src/metabase-enterprise/license/components/BillingInfo/BillingInfo.tsx+++ b/enterprise/frontend/src/metabase-enterprise/license/components/BillingInfo/BillingInfo.tsx@@ -46,7 +46,7 @@ const BillingInfoError = () => {<SettingHeader id="billing" title={t`Billing`} /><Box mt="1rem" data-testid="billing-info-error"><Alert variant="error" icon="warning">- <Text c="text-medium">+ <Text c="text-secondary">{t`An error occurred while fetching information about your billing.`}<br /><strong>{t`Need help?`}</strong>{" "}diff --git a/enterprise/frontend/src/metabase-enterprise/license/components/BillingInfo/BillingInfoTable.tsx b/enterprise/frontend/src/metabase-enterprise/license/components/BillingInfo/BillingInfoTable.tsxindex 3e0255c9ac9..414f0d7a3c2 100644--- a/enterprise/frontend/src/metabase-enterprise/license/components/BillingInfo/BillingInfoTable.tsx+++ b/enterprise/frontend/src/metabase-enterprise/license/components/BillingInfo/BillingInfoTable.tsx@@ -96,7 +96,11 @@ function BillingInfoRow({return (<ErrorBoundary errorComponent={EmptyErrorComponent}><BillingInfoRowContainer extraPadding={extraPadding} {...props}>- <Text c="text-md" maw="15rem" data-testid={`billing-info-key-${id}`}>+ <Text+ c="text-secondary"+ maw="15rem"+ data-testid={`billing-info-key-${id}`}+ >{lineItem.name}</Text><BillingInfoValuediff --git a/enterprise/frontend/src/metabase-enterprise/license/components/StillNeedHelp/StillNeedHelp.tsx b/enterprise/frontend/src/metabase-enterprise/license/components/StillNeedHelp/StillNeedHelp.tsxindex ced56cf42a3..a034d1e1896 100644--- a/enterprise/frontend/src/metabase-enterprise/license/components/StillNeedHelp/StillNeedHelp.tsx+++ b/enterprise/frontend/src/metabase-enterprise/license/components/StillNeedHelp/StillNeedHelp.tsx@@ -4,14 +4,14 @@ import { t } from "ttag";import { Anchor, Text } from "metabase/ui";const Container = styled.div`- background: var(--mb-color-bg-light);+ background: var(--mb-color-background-secondary);border-radius: 0.5rem;padding: 0.75rem 1rem;margin-top: 1.5rem;`;const Title = styled.div`- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);font-weight: bold;text-transform: uppercase;margin-bottom: 0.5rem;@@ -21,7 +21,7 @@ export const StillNeedHelp = () => {return (<Container><Title>{t`Still need help?`}</Title>- <Text color="text-medium">+ <Text c="text-secondary">{t`You can ask for billing help at `}{/* eslint-disable-next-line i18next/no-literal-string */}<Anchor href="mailto:[email protected]">[email protected]</Anchor>diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/Metabot.tsx b/enterprise/frontend/src/metabase-enterprise/metabot/components/Metabot.tsxindex 7c73ba91ec8..973b3355de2 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/components/Metabot.tsx+++ b/enterprise/frontend/src/metabase-enterprise/metabot/components/Metabot.tsx@@ -28,7 +28,7 @@ const MetabotErrorFallback = ({ onRetry }: { onRetry: () => void }) => {data-testid="metabot-error-fallback"><Box component={MetabotFailure} w="6rem" />- <Text c="text-light" maw="12rem" ta="center">+ <Text c="text-tertiary" maw="12rem" ta="center">{t`Something went wrong.`}</Text><Buttondiff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabotAdminPage.tsx b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabotAdminPage.tsxindex 28a656a6c76..1a9f4174a9a 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabotAdminPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabotAdminPage.tsx@@ -85,7 +85,7 @@ export function MetabotAdminPage() {.t`${metabot.name} is Metabase's AI agent. To help ${metabot.name} more easily find and focus on the data you care about most, configure what content it should be able to access or use to create queries.`}/>{isEmbedMetabot && (- <Text c="text-medium" maw="40rem">+ <Text c="text-secondary" maw="40rem">{t`If you're embedding the Metabot component in an app, you can specify a different collection that embedded Metabot is allowed to use for creating queries.`}</Text>)}@@ -287,11 +287,11 @@ function CollectionInfo({ collection }: { collection: Collection }) {const parent = collectionInfo?.effective_ancestors?.slice(-1)?.[0];return (- <Flex align="center" gap="sm" c="text-light" mb="sm">+ <Flex align="center" gap="sm" c="text-tertiary" mb="sm">{parent && (<><CollectionDisplay collection={parent} />- <Text c="text-light" fw="bold">+ <Text c="text-tertiary" fw="bold">/</Text></>@@ -310,7 +310,7 @@ const CollectionDisplay = ({return (<Flex align="center" gap="sm"><Icon {...icon} c={icon.color ?? "brand"} />- <Text c="text-medium" fw="bold">+ <Text c="text-secondary" fw="bold">{collection.name}</Text></Flex>diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabotAdminSuggestedPrompts.tsx b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabotAdminSuggestedPrompts.tsxindex 1abffbe270a..a0eb2f266e2 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabotAdminSuggestedPrompts.tsx+++ b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabotAdminSuggestedPrompts.tsx@@ -154,7 +154,7 @@ export const MetabotPromptSuggestionPane = ({{t`Something went wrong.`}</Center>) : data?.total === 0 ? (- <Center my="lg" fw="bold" c="text-light">+ <Center my="lg" fw="bold" c="text-tertiary">{t`No prompts found.`}</Center>) : null@@ -211,7 +211,7 @@ const SuggestedPromptRow = ({</Box><td><Flex align="center" gap="sm">- <Icon name={row.model} c="text-medium" /> {row.model_name}+ <Icon name={row.model} c="text-secondary" /> {row.model_name}</Flex></td><Box component="td" h="3.5rem">diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabotPurchasePage/MetabotPurchasePageForStoreUser.tsx b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabotPurchasePage/MetabotPurchasePageForStoreUser.tsxindex 93db4ad6137..17da5bf7a92 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabotPurchasePage/MetabotPurchasePageForStoreUser.tsx+++ b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAdmin/MetabotPurchasePage/MetabotPurchasePageForStoreUser.tsx@@ -138,7 +138,7 @@ export const MetabotPurchasePageForStoreUser = () => {<Stack gap="md"><Card- bg="var(--mb-color-bg-light)"+ bg="background-secondary"p={12}radius="md"shadow="none"diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAppBarButton.tsx b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAppBarButton.tsxindex 11ebba80d8e..ab1a83c316f 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAppBarButton.tsx+++ b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotAppBarButton.tsx@@ -31,7 +31,7 @@ export function MetabotAppBarButton({<ActionIconclassName={className}variant="subtle"- c="var(--mb-color-text-primary)"+ c="text-primary"bd="1px solid var(--mb-color-border)"p="sm"h="2.25rem"diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.tsx b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.tsxindex c765ac656b5..be4e762bc63 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotAgentSuggestionMessage.tsx@@ -140,7 +140,7 @@ export const AgentSuggestionMessage = ({<Papershadow="none"radius="md"- bg="bg-white"+ bg="background-primary"className={S.container}data-testid="metabot-chat-suggestion">@@ -156,10 +156,7 @@ export const AgentSuggestionMessage = ({<Text size="sm">{suggestedTransform.name}</Text></Flex><Flex align="center" gap="sm">- <Text- size="sm"- c={isNew ? "var(--mb-color-saturated-blue)" : "text-secondary"}- >+ <Text size="sm" c={isNew ? "saturated-blue" : "text-secondary"}>{isNew ? t`New` : t`Revision`}</Text><Flex align="center" justify="center" h="md" w="md">@@ -175,13 +172,25 @@ export const AgentSuggestionMessage = ({>{match({ isLoading, error }).with({ error: P.not(P.nullish) }, () => (- <Flex p="md" bg="bg-light" justify="center" align="center" gap="sm">+ <Flex+ p="md"+ bg="background-secondary"+ justify="center"+ align="center"+ gap="sm"+ ><Text mb="1px" c="danger">{t`Failed to load preview`}</Text></Flex>)).with({ isLoading: true }, () => (- <Flex p="md" bg="bg-light" justify="center" align="center" gap="sm">- <Loader size="xs" color="text-secondary" type="dots" />+ <Flex+ p="md"+ bg="background-secondary"+ justify="center"+ align="center"+ gap="sm"+ >+ <Loader size="xs" c="text-secondary" type="dots" /><Text mb="1px" c="text-secondary">{t`Loading preview`}</Text></Flex>))@@ -211,7 +220,7 @@ export const AgentSuggestionMessage = ({variant="subtle"fw="normal"fz="sm"- c={canApply ? "success" : "text-light"}+ c={canApply ? "success" : "text-tertiary"}disabled={!canApply}onClick={handleApply}>diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotAgentTodoMessage.tsx b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotAgentTodoMessage.tsxindex 3eda824e0b2..c6907b63ba5 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotAgentTodoMessage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotAgentTodoMessage.tsx@@ -3,13 +3,14 @@ import cx from "classnames";import { match } from "ts-pattern";import { t } from "ttag";+import type { ColorName } from "metabase/lib/colors/types";import { Collapse, Flex, Group, Icon, Paper, Stack, Text } from "metabase/ui";import type { MetabotTodoItem } from "metabase-types/api";import S from "./MetabotAgentTodoMessage.module.css";type TodoStatusConfig = {- color: string;+ color: ColorName;td?: string;};diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotAgentToolCallMessage.tsx b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotAgentToolCallMessage.tsxindex 8fb7b6b37e3..7af6e6504bc 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotAgentToolCallMessage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotAgentToolCallMessage.tsx@@ -46,7 +46,7 @@ const ToolCallDetailsModal = ({title={<Flex align="center">{t`Tool Call: ${message.name}`}- <Badge ml="sm" color="text-dark">+ <Badge ml="sm" color="text-primary">{message.id}</Badge></Flex>@@ -74,7 +74,7 @@ const ToolCallDetailsModal = ({<Flex align="center"><Text fw="bold">{t`Response`}</Text>{message.is_error && (- <Badge ml="sm" bg="danger" c="text-white">+ <Badge ml="sm" bg="danger" c="text-primary-inverse">{t`Errored`}</Badge>)}@@ -107,7 +107,7 @@ export const AgentToolCallMessage = ({<Flexp="sm"pl="md"- bg="bg-light"+ bg="background-secondary"bd="1px solid var(--mb-color-border)"bdrs="sm"direction="row"diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotChat.module.css b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotChat.module.cssindex c5e6e1b2364..1fd1a092413 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotChat.module.css+++ b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotChat.module.css@@ -33,7 +33,7 @@}.inputContainerLoading {- background: var(--mb-color-bg-light);+ background: var(--mb-color-background-secondary);}.messagesContainer {@@ -77,14 +77,14 @@.messageUser {padding: 0.5rem 1rem;border-radius: 1rem;- background: var(--mb-color-bg-medium);+ background: var(--mb-color-background-tertiary);}.messageUserAction {padding: 0.5rem 1rem;border-radius: 0.5rem;- background: var(--mb-color-bg-light);- border: 1px solid var(--mb-color-bg-medium);+ background: var(--mb-color-background-secondary);+ border: 1px solid var(--mb-color-background-tertiary);font-weight: bold;}diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotChat.tsx b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotChat.tsxindex 238af8dcc22..3d5e1493d67 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotChat.tsx+++ b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotChat.tsx@@ -127,7 +127,7 @@ export const MetabotChat = ({data-testid="metabot-empty-chat-info"><Box component={EmptyDashboardBot} w="6rem" />- <Text c="text-light" maw="12rem" ta="center">+ <Text c="text-tertiary" maw="12rem" ta="center">{config.emptyText ??t`I can help you explore your metrics and models.`}</Text>diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotChatEditor/MetabotChatEditor.module.css b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotChatEditor/MetabotChatEditor.module.cssindex d7fec6045d0..a126d9c3426 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotChatEditor/MetabotChatEditor.module.css+++ b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotChatEditor/MetabotChatEditor.module.css@@ -58,7 +58,7 @@}.sendIcon {- color: var(--mb-color-bg-white);+ color: var(--mb-color-background-primary);width: 0.8rem;transition: color 150ms ease;}diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotResetLongChatButton.tsx b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotResetLongChatButton.tsxindex 782bea6db6a..e7463ad5db4 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotResetLongChatButton.tsx+++ b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotResetLongChatButton.tsx@@ -9,7 +9,7 @@ interface MetabotResetLongChatButtonProps {export const MetabotResetLongChatButton = ({onResetConversation,}: MetabotResetLongChatButtonProps) => (- <Text lh={1} c="text-light" m={0} ta="center">+ <Text lh={1} c="text-tertiary" m={0} ta="center">{jt`This chat is getting long. You can ${(<UnstyledButtonkey="reset"diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotThinking.module.css b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotThinking.module.cssindex da5952fc3fc..5ff5062b6f2 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotThinking.module.css+++ b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotChat/MetabotThinking.module.css@@ -6,7 +6,7 @@.toolCallStarted {--spread: 160px;- --base-gradient-color: var(--mb-color-bg-white);+ --base-gradient-color: var(--mb-color-background-primary);--base-color: var(--mb-color-text-primary);--bg: linear-gradient(90deg,diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotInlineSQLPrompt/MetabotInlineSQLPrompt.module.css b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotInlineSQLPrompt/MetabotInlineSQLPrompt.module.cssindex 5a38282384e..e2eb177c63c 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotInlineSQLPrompt/MetabotInlineSQLPrompt.module.css+++ b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotInlineSQLPrompt/MetabotInlineSQLPrompt.module.css@@ -8,7 +8,7 @@gap: 0.25rem;padding: 0.5rem;margin-bottom: 0.125rem;- background: var(--mb-color-bg-white);+ background: var(--mb-color-background-primary);border: 1px solid var(--mb-color-border);border-radius: 0.5rem;box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotInlineSQLPrompt/MetabotInlineSQLPrompt.tsx b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotInlineSQLPrompt/MetabotInlineSQLPrompt.tsxindex dc3c98a9904..9c68c42d4d1 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotInlineSQLPrompt/MetabotInlineSQLPrompt.tsx+++ b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotInlineSQLPrompt/MetabotInlineSQLPrompt.tsx@@ -103,7 +103,7 @@ export const MetabotInlineSQLPrompt = ({disabled={disabled}leftSection={isDoingScience ? (- <Loader size="xs" color="text-light" />+ <Loader size="xs" color="text-tertiary" />) : (<Icon name="insight" />)diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotPromptInput/MetabotPromptInput.module.css b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotPromptInput/MetabotPromptInput.module.cssindex ca66bcc6d89..66db8c4996e 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotPromptInput/MetabotPromptInput.module.css+++ b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotPromptInput/MetabotPromptInput.module.css@@ -6,7 +6,7 @@width: 100%;padding: 0.5rem 0;line-height: 1.7;- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);font-size: var(--mantine-font-size-md);min-height: 1.7em;white-space: pre-wrap;@@ -22,7 +22,7 @@}.content :global(.is-empty:first-child:before) {- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);content: attr(data-placeholder);height: 0;pointer-events: none;diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotQueryBuilder/MetabotQueryBuilder.module.css b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotQueryBuilder/MetabotQueryBuilder.module.cssindex ed3a361869e..fb1e3709d2c 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotQueryBuilder/MetabotQueryBuilder.module.css+++ b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotQueryBuilder/MetabotQueryBuilder.module.css@@ -3,7 +3,7 @@flex-direction: column;height: 100%;width: 100%;- background: var(--mb-color-bg-white);+ background: var(--mb-color-background-primary);position: relative;}@@ -60,7 +60,7 @@}.inputContainerLoading {- background: var(--mb-color-bg-light);+ background: var(--mb-color-background-secondary);animation: pulse 5s ease-in-out 1s infinite;}@@ -85,7 +85,7 @@&:disabled,&:disabled:hover {background-color: var(--mb-color-brand);- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);border-color: var(--mb-color-brand);opacity: 0.35;}@@ -112,7 +112,7 @@opacity 150ms ease;&:hover {- background: var(--mb-color-bg-light);+ background: var(--mb-color-background-secondary);color: var(--mb-color-text-primary);}}@@ -152,10 +152,10 @@@keyframes pulse {0%,100% {- background: var(--mb-color-bg-light);+ background: var(--mb-color-background-secondary);}50% {- background: var(--mb-color-bg-medium);+ background: var(--mb-color-background-secondary-inverse);}}diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotQueryBuilder/MetabotQueryBuilder.tsx b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotQueryBuilder/MetabotQueryBuilder.tsxindex 2ca156aa187..3c9f5dbe204 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotQueryBuilder/MetabotQueryBuilder.tsx+++ b/enterprise/frontend/src/metabase-enterprise/metabot/components/MetabotQueryBuilder/MetabotQueryBuilder.tsx@@ -168,7 +168,7 @@ export const MetabotQueryBuilder = () => {<Box className={S.centeredContainer}><Box className={S.greeting}><MetabotLogo className={S.greetingIcon} />- <Text fz={{ base: "xl", sm: 32 }} fw={600} c="text-dark">+ <Text fz={{ base: "xl", sm: 32 }} fw={600} c="text-primary">{title}</Text></Box>diff --git a/enterprise/frontend/src/metabase-enterprise/moderation/components/ModerationReviewBanner/ModerationReviewBanner.styled.tsx b/enterprise/frontend/src/metabase-enterprise/moderation/components/ModerationReviewBanner/ModerationReviewBanner.styled.tsxindex f0da3f882d0..670dce2b571 100644--- a/enterprise/frontend/src/metabase-enterprise/moderation/components/ModerationReviewBanner/ModerationReviewBanner.styled.tsx+++ b/enterprise/frontend/src/metabase-enterprise/moderation/components/ModerationReviewBanner/ModerationReviewBanner.styled.tsx@@ -23,7 +23,7 @@ export const Text = styled.span``;export const Time = styled.time`- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);font-size: 0.766rem;line-height: 1.25rem;`;diff --git a/enterprise/frontend/src/metabase-enterprise/moderation/components/QuestionModerationSection/QuestionModerationSection.styled.tsx b/enterprise/frontend/src/metabase-enterprise/moderation/components/QuestionModerationSection/QuestionModerationSection.styled.tsxindex e83612604b7..983011b449d 100644--- a/enterprise/frontend/src/metabase-enterprise/moderation/components/QuestionModerationSection/QuestionModerationSection.styled.tsx+++ b/enterprise/frontend/src/metabase-enterprise/moderation/components/QuestionModerationSection/QuestionModerationSection.styled.tsx@@ -17,7 +17,7 @@ export const VerifyButton = styled((props: ButtonProps) => (padding: 8px;&:disabled {- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);}position: relative;diff --git a/enterprise/frontend/src/metabase-enterprise/moderation/constants.ts b/enterprise/frontend/src/metabase-enterprise/moderation/constants.tsindex 07beaa5291f..f72e3693b5e 100644--- a/enterprise/frontend/src/metabase-enterprise/moderation/constants.ts+++ b/enterprise/frontend/src/metabase-enterprise/moderation/constants.ts@@ -22,5 +22,5 @@ MODERATION_STATUS_ICONS.set("verified_filled", {MODERATION_STATUS_ICONS.set(null, {name: "close",- color: "text-light",+ color: "text-tertiary",});diff --git a/enterprise/frontend/src/metabase-enterprise/moderation/service.unit.spec.ts b/enterprise/frontend/src/metabase-enterprise/moderation/service.unit.spec.tsindex f68edaccb41..6df50f84981 100644--- a/enterprise/frontend/src/metabase-enterprise/moderation/service.unit.spec.ts+++ b/enterprise/frontend/src/metabase-enterprise/moderation/service.unit.spec.ts@@ -92,7 +92,7 @@ describe("moderation/service", () => {it("should return an icon for a removed review", () => {expect(getRemovedReviewStatusIcon()).toEqual({name: "close",- color: "text-light",+ color: "text-tertiary",});});});diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/ChangesLists/AllChangesView.tsx b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/ChangesLists/AllChangesView.tsxindex 392ee379df9..99db5fc6418 100644--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/ChangesLists/AllChangesView.tsx+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/ChangesLists/AllChangesView.tsx@@ -126,7 +126,7 @@ export const AllChangesView = ({ entities, title }: AllChangesViewProps) => {p="sm"gap="sm"mb={group.items.length > 0 ? "0.75rem" : 0}- bg="bg-light"+ bg="background-secondary"bdrs="md"><Icon name="synced_collection" size={16} c="text-secondary" />diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/ChangesLists/ChangesLists.tsx b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/ChangesLists/ChangesLists.tsxindex 9e0e02dee29..9633f4dd3b5 100644--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/ChangesLists/ChangesLists.tsx+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/ChangesLists/ChangesLists.tsx@@ -29,7 +29,7 @@ export const ChangesLists = ({ title }: ChangesListsProps) => {if (allEntities.length === 0) {return (<Box ta="center" py="xl">- <Text c="text-light" size="sm">+ <Text c="text-tertiary" size="sm">{t`No changes to push`}</Text></Box>diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/CollectionSyncList/CollectionSyncList.tsx b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/CollectionSyncList/CollectionSyncList.tsxindex aea771f847e..17d1ad36e59 100644--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/CollectionSyncList/CollectionSyncList.tsx+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/CollectionSyncList/CollectionSyncList.tsx@@ -61,15 +61,15 @@ export const CollectionSyncList = ({}if (collections.length === 0) {- return <Text c="text-medium">{emptyMessage}</Text>;+ return <Text c="text-secondary">{emptyMessage}</Text>;}return (<Box+ bg="background-primary"style={{borderRadius: "var(--mantine-radius-md)",border: "1px solid var(--mb-color-border)",- backgroundColor: "var(--mb-color-bg-white)",overflow: "hidden",}}>diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/CollectionSyncRow/CollectionSyncRow.tsx b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/CollectionSyncRow/CollectionSyncRow.tsxindex db41668504c..55898b13be2 100644--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/CollectionSyncRow/CollectionSyncRow.tsx+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/CollectionSyncRow/CollectionSyncRow.tsx@@ -34,7 +34,7 @@ export const CollectionSyncRow = ({><Flex justify="space-between" align="center"><Flex align="center" gap="sm">- <Icon name={icon.name} c={icon.color ?? "text-medium"} />+ <Icon name={icon.name} c={icon.color ?? "text-secondary"} /><Text fw="medium">{collection.name}</Text></Flex><Flex align="center" gap="sm">diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/GitSettingsModal/GitSettingsModal.tsx b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/GitSettingsModal/GitSettingsModal.tsxindex d3f5f4cb64e..8eba3cb9010 100644--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/GitSettingsModal/GitSettingsModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/GitSettingsModal/GitSettingsModal.tsx@@ -26,7 +26,7 @@ export const GitSettingsModal = ({size="xl"padding="xl">- <Text c="text-medium" size="md" fw={400} lh="1.25rem" mb="lg">+ <Text c="text-secondary" size="md" fw={400} lh="1.25rem" mb="lg">{t`Keep your Library and transforms safely backed up in Git.`}</Text><RemoteSyncSettingsFormdiff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/GitSyncControls/BranchDropdown.tsx b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/GitSyncControls/BranchDropdown.tsxindex aab583b2f7b..dae6d045702 100644--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/GitSyncControls/BranchDropdown.tsx+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/GitSyncControls/BranchDropdown.tsx@@ -122,7 +122,7 @@ export const BranchDropdown = ({<>{filteredBranches.length === 0 && !showCreateOption ? (<Box p="md">- <Text size="sm" c="text-light" ta="center">+ <Text size="sm" c="text-tertiary" ta="center">{searchValue? t`No branches found`: t`No branches available`}@@ -134,7 +134,12 @@ export const BranchDropdown = ({<><Combobox.Options><Box px="sm" py="sm">- <Text size="xs" c="text-light" tt="uppercase" fw="bold">+ <Text+ size="xs"+ c="text-tertiary"+ tt="uppercase"+ fw="bold"+ >{t`Branches`}</Text></Box>@@ -168,7 +173,7 @@ export const BranchDropdown = ({<Icon name="add" size={16} /><Box><Text lh="md">{t`Create branch "${searchValue}"`}</Text>- <Text size="xs" c="text-light">+ <Text size="xs" c="text-tertiary">{t`from ${baseBranch || value}`}</Text></Box>diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/GitSyncControls/GitSyncControls.tsx b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/GitSyncControls/GitSyncControls.tsxindex 06dddb79547..1ca6a2e021e 100644--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/GitSyncControls/GitSyncControls.tsx+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/GitSyncControls/GitSyncControls.tsx@@ -161,14 +161,16 @@ export const GitSyncControls = () => {setDropdownView("options");combobox.toggleDropdown();}}- leftSection={<Icon name="git_branch" c="text-medium" size={14} />}+ leftSection={+ <Icon name="git_branch" c="text-secondary" size={14} />+ }rightSection={isLoading ? (<Loader size="xs" />) : (<Iconname="chevrondown"- c="text-medium"+ c="text-secondary"size={8}className={cx(S.chevronIcon, {[S.opened]: combobox.dropdownOpened,@@ -178,7 +180,7 @@ export const GitSyncControls = () => {}data-testid="git-sync-controls">- <Text fw="bold" c="text-medium" size="sm" lh="md" truncate>+ <Text fw="bold" c="text-secondary" size="sm" lh="md" truncate>{currentBranch}</Text></Button>diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/PushChangesModal/CommitMessageSection.tsx b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/PushChangesModal/CommitMessageSection.tsxindex 7f52995d5ae..2018d109056 100644--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/PushChangesModal/CommitMessageSection.tsx+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/PushChangesModal/CommitMessageSection.tsx@@ -25,7 +25,7 @@ export const CommitMessageSection = ({},}}/>- <Text size="xs" c="text-medium" mt="sm">+ <Text size="xs" c="text-secondary" mt="sm">{t`This message will be visible in your Git history`}</Text></Box>diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/RemoteSyncAdminSettings/RemoteSyncSettingsForm.tsx b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/RemoteSyncAdminSettings/RemoteSyncSettingsForm.tsxindex 9a8719ec49b..d4612a7e833 100644--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/RemoteSyncAdminSettings/RemoteSyncSettingsForm.tsx+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/RemoteSyncAdminSettings/RemoteSyncSettingsForm.tsx@@ -291,7 +291,7 @@ export const RemoteSyncSettingsForm = (props: RemoteSyncSettingsFormProps) => {<Form disabled={!dirty}><Stack gap="xl" maw="52rem">{!isModalVariant && !isRemoteSyncEnabled && (- <Text c="text-medium" size="sm">+ <Text c="text-secondary" size="sm">{jt`Need help setting this up? Check out our ${(<ExternalLink key="link" href={docsUrl}>{t`setup guide`}@@ -316,7 +316,7 @@ export const RemoteSyncSettingsForm = (props: RemoteSyncSettingsFormProps) => {name={TOKEN_KEY}label={t`Access Token`}description={- <Text c="text-light" size="sm" lh="md" component="span">+ <Text c="text-tertiary" size="sm" lh="md" component="span">{t`Personal access token with write permissions`}</Text>}@@ -340,7 +340,11 @@ export const RemoteSyncSettingsForm = (props: RemoteSyncSettingsFormProps) => {<Box><Radiodescription={- <Text c="text-medium" lh="1.25rem" component="span">+ <Text+ c="text-secondary"+ lh="1.25rem"+ component="span"+ >{t`Usually you should use this for your production ${applicationName} instance. All synced collections are read-only, and will automatically sync with the specified branch (we'd recommend syncing with main).`}</Text>}@@ -362,7 +366,7 @@ export const RemoteSyncSettingsForm = (props: RemoteSyncSettingsFormProps) => {</Text>}description={- <Text c="text-medium" lh="1.25rem" component="span">+ <Text c="text-secondary" lh="1.25rem" component="span">{t`This mode is generally for development or local instances of ${applicationName}. Changes you make to content in synced collections can be pushed and pulled from any git branch.`}</Text>}@@ -429,7 +433,7 @@ export const RemoteSyncSettingsForm = (props: RemoteSyncSettingsFormProps) => {{/* Read-write mode info */}{isModalVariant && values?.[TYPE_KEY] === "read-write" && (- <Text c="text-medium" size="sm">+ <Text c="text-secondary" size="sm">{t`In read-write mode, the Library collection will be enabled for syncing.`}</Text>)}diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncedCollectionsSidebarSection/SyncedCollectionsSidebarSection.tsx b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncedCollectionsSidebarSection/SyncedCollectionsSidebarSection.tsxindex 63c5e1ef551..5ab3fcbcb98 100644--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncedCollectionsSidebarSection/SyncedCollectionsSidebarSection.tsx+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncedCollectionsSidebarSection/SyncedCollectionsSidebarSection.tsx@@ -65,7 +65,7 @@ export const SyncedCollectionsSidebarSection = ({</Flex>{!hasSyncedCollections && (- <Text c="text-light" fz="sm" ta="center">+ <Text c="text-tertiary" fz="sm" ta="center">{t`No synced collections`}</Text>)}diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/utils.ts b/enterprise/frontend/src/metabase-enterprise/remote_sync/utils.tsindex 0ab6c980b89..e5909aafdfd 100644--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/utils.ts+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/utils.ts@@ -1,5 +1,6 @@import { t } from "ttag";+import type { ColorName } from "metabase/lib/colors/types";import type { IconName } from "metabase/ui";import type {Collection,@@ -42,18 +43,20 @@ export const getSyncStatusIcon = (status: RemoteSyncEntityStatus): IconName => {}};-export const getSyncStatusColor = (status: RemoteSyncEntityStatus): string => {+export const getSyncStatusColor = (+ status: RemoteSyncEntityStatus,+): ColorName => {switch (status) {case "create":- return "var(--mb-color-success)";+ return "success";case "removed":case "delete":- return "var(--mb-color-danger)";+ return "danger";case "update":case "touch":- return "var(--mb-color-saturated-blue)";+ return "saturated-blue";default:- return "var(--mb-color-info)";+ return "info";}};diff --git a/enterprise/frontend/src/metabase-enterprise/sandboxes/components/AttributeMappingEditor/DataAttributeMappingEditor.tsx b/enterprise/frontend/src/metabase-enterprise/sandboxes/components/AttributeMappingEditor/DataAttributeMappingEditor.tsxindex ea141bbae6d..16238b7268c 100644--- a/enterprise/frontend/src/metabase-enterprise/sandboxes/components/AttributeMappingEditor/DataAttributeMappingEditor.tsx+++ b/enterprise/frontend/src/metabase-enterprise/sandboxes/components/AttributeMappingEditor/DataAttributeMappingEditor.tsx@@ -132,7 +132,6 @@ export const DataAttributeMappingEditor = ({onClick={() =>handleChange(removeEntry<ValueType>(entries, index))}- color={"text"}data-testid="remove-mapping"/></td>diff --git a/enterprise/frontend/src/metabase-enterprise/sandboxes/components/LoginAttributesWidget/LoginAttributeMappingEditor.tsx b/enterprise/frontend/src/metabase-enterprise/sandboxes/components/LoginAttributesWidget/LoginAttributeMappingEditor.tsxindex 5d8581efbff..8d98ed98e25 100644--- a/enterprise/frontend/src/metabase-enterprise/sandboxes/components/LoginAttributesWidget/LoginAttributeMappingEditor.tsx+++ b/enterprise/frontend/src/metabase-enterprise/sandboxes/components/LoginAttributesWidget/LoginAttributeMappingEditor.tsx@@ -249,7 +249,6 @@ const ValueInput = ({<ButtonleftSection={<Icon name="close" />}onClick={onDelete}- color={"text"}data-testid="remove-mapping"/>)}@@ -260,7 +259,6 @@ const ValueInput = ({<ButtonleftSection={<Icon name="refresh" />}onClick={onRevert}- color={"text"}data-testid="revert-mapping"/></Tooltip>@@ -290,7 +288,7 @@ const InfoCard = ({!["tenant", "system", "jwt"].includes(source ?? "") ? null : (<HoverCard><HoverCard.Target>- <Icon name="info" c="text-light" />+ <Icon name="info" c="text-tertiary" /></HoverCard.Target><HoverCard.Dropdown maw="20rem"><Text p="sm" maw="20rem">diff --git a/enterprise/frontend/src/metabase-enterprise/semantic_search/SearchSettingsWidget.tsx b/enterprise/frontend/src/metabase-enterprise/semantic_search/SearchSettingsWidget.tsxindex 391ac0f0a35..4bbc626519c 100644--- a/enterprise/frontend/src/metabase-enterprise/semantic_search/SearchSettingsWidget.tsx+++ b/enterprise/frontend/src/metabase-enterprise/semantic_search/SearchSettingsWidget.tsx@@ -109,7 +109,7 @@ export function SearchSettingsWidget({maw="25rem"animated={progress < 100}/>- <Text c="text-light" size="md">+ <Text c="text-tertiary" size="md">{progress === 100? t`Initialized search index`: t`Initializing search index...`}diff --git a/enterprise/frontend/src/metabase-enterprise/smtp-override/components/CloudSMTPConnectionCard.module.css b/enterprise/frontend/src/metabase-enterprise/smtp-override/components/CloudSMTPConnectionCard.module.cssindex 86245e90a9b..f348286d586 100644--- a/enterprise/frontend/src/metabase-enterprise/smtp-override/components/CloudSMTPConnectionCard.module.css+++ b/enterprise/frontend/src/metabase-enterprise/smtp-override/components/CloudSMTPConnectionCard.module.css@@ -1,5 +1,5 @@.root {- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);border: 1px solid var(--mb-color-border);border-radius: var(--mantine-radius-md);}diff --git a/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionMenu/SnippetCollectionMenu.tsx b/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionMenu/SnippetCollectionMenu.tsxindex 4f96f2e8ff5..2b55542524b 100644--- a/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionMenu/SnippetCollectionMenu.tsx+++ b/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionMenu/SnippetCollectionMenu.tsx@@ -58,7 +58,7 @@ export function SnippetCollectionMenu({<Buttonw={24}h={24}- c="text-medium"+ c="text-secondary"size="compact-xs"variant="subtle"leftSection={<FixedSizeIcon name="ellipsis" size={16} />}diff --git a/enterprise/frontend/src/metabase-enterprise/support/components/SupportSettingsSection/SupportSettingsSection.tsx b/enterprise/frontend/src/metabase-enterprise/support/components/SupportSettingsSection/SupportSettingsSection.tsxindex dcd08be4cfc..be1da1e5883 100644--- a/enterprise/frontend/src/metabase-enterprise/support/components/SupportSettingsSection/SupportSettingsSection.tsx+++ b/enterprise/frontend/src/metabase-enterprise/support/components/SupportSettingsSection/SupportSettingsSection.tsx@@ -32,11 +32,11 @@ export function SupportSettingsSection() {title={t`Helping hand`}description={<>- <Text c="text-medium" mt="sm">+ <Text c="text-secondary" mt="sm">{/* eslint-disable-next-line no-literal-metabase-strings -- This string only shows for admins. */}{t`Let a Metabase Success Engineer log in to your instance with a troubleshooting account to help resolve problems for you.`}</Text>- <Text c="text-medium">+ <Text c="text-secondary">{t`Access always auto expires after the period you select.`}</Text></>diff --git a/enterprise/frontend/src/metabase-enterprise/table-editing/common/TableHeader.tsx b/enterprise/frontend/src/metabase-enterprise/table-editing/common/TableHeader.tsxindex f58898cbf44..20204a4eb7d 100644--- a/enterprise/frontend/src/metabase-enterprise/table-editing/common/TableHeader.tsx+++ b/enterprise/frontend/src/metabase-enterprise/table-editing/common/TableHeader.tsx@@ -26,7 +26,7 @@ export function TableHeader({align="center"p="0.5rem 1rem 0.5rem 2rem"mih="4rem"- bg="var(--mb-color-background)"+ bg="background-primary">{database && table ? (<TableBreadcrumbsdiff --git a/enterprise/frontend/src/metabase-enterprise/table-editing/inputs/TableActionInputBoolean.tsx b/enterprise/frontend/src/metabase-enterprise/table-editing/inputs/TableActionInputBoolean.tsxindex 33a9f2f9d41..15758e90d88 100644--- a/enterprise/frontend/src/metabase-enterprise/table-editing/inputs/TableActionInputBoolean.tsx+++ b/enterprise/frontend/src/metabase-enterprise/table-editing/inputs/TableActionInputBoolean.tsx@@ -77,7 +77,9 @@ export const TableActionInputBoolean = ({{value ? (value) : (- <Input.Placeholder c="text-light">{NULL_LABEL}</Input.Placeholder>+ <Input.Placeholder c="text-tertiary">+ {NULL_LABEL}+ </Input.Placeholder>)}</Input></Combobox.Target>diff --git a/enterprise/frontend/src/metabase-enterprise/table-editing/inputs/TableActionInputSearchableSelect.tsx b/enterprise/frontend/src/metabase-enterprise/table-editing/inputs/TableActionInputSearchableSelect.tsxindex 5ce3abdbf12..0c5636649db 100644--- a/enterprise/frontend/src/metabase-enterprise/table-editing/inputs/TableActionInputSearchableSelect.tsx+++ b/enterprise/frontend/src/metabase-enterprise/table-editing/inputs/TableActionInputSearchableSelect.tsx@@ -101,7 +101,10 @@ export const TableActionInputSearchableSelect = ({if (!value && inputProps?.placeholder) {return (- <Input.Placeholder c="text-light" className={classNames?.selectLabel}>+ <Input.Placeholder+ c="text-tertiary"+ className={classNames?.selectLabel}+ >{inputProps.placeholder}</Input.Placeholder>);@@ -109,7 +112,10 @@ export const TableActionInputSearchableSelect = ({if (isLoading) {return (- <Input.Placeholder c="text-light" className={classNames?.selectLabel}>+ <Input.Placeholder+ c="text-tertiary"+ className={classNames?.selectLabel}+ >{t`Loading...`}</Input.Placeholder>);@@ -161,7 +167,7 @@ export const TableActionInputSearchableSelect = ({shouldDisplayClearButton && (<Iconname="close"- color="var(--mb-color-text-light)"+ c="text-tertiary"onClick={() => handleOptionSubmit(null)}onMouseDown={(event) => event.stopPropagation()}/>diff --git a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/EditTableDataContainer.module.css b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/EditTableDataContainer.module.cssindex 3cf02c3cf05..bb8f111e689 100644--- a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/EditTableDataContainer.module.css+++ b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/EditTableDataContainer.module.css@@ -7,12 +7,12 @@.gridWrapper {overflow: hidden;flex-grow: 1;- background-color: var(--mb-color-background);+ background-color: var(--mb-color-background-primary);}.gridFooter {border: 1px solid var(--mb-color-border);- background-color: var(--mb-color-background);+ background-color: var(--mb-color-background-primary);color: var(--mb-color-text-secondary);padding: 0.5rem 1.5rem;padding-left: 0.5rem;@@ -22,6 +22,6 @@}.filtersSection {- background-color: var(--mb-color-background);+ background-color: var(--mb-color-background-primary);border-top: 1px solid var(--mb-color-border);}diff --git a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/EditTableDataOverlay.module.css b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/EditTableDataOverlay.module.cssindex 65070e35c02..2bc54d7049b 100644--- a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/EditTableDataOverlay.module.css+++ b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/EditTableDataOverlay.module.css@@ -14,7 +14,7 @@color: var(--mb-color-brand);background-color: color-mix(in srgb,- var(--mb-color-bg-white) 75%,+ var(--mb-color-background-primary) 75%,transparent);transition:diff --git a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/data-grid/EditTableDataGrid.module.css b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/data-grid/EditTableDataGrid.module.cssindex e7db5061b86..89671c4a4d3 100644--- a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/data-grid/EditTableDataGrid.module.css+++ b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/data-grid/EditTableDataGrid.module.css@@ -16,10 +16,10 @@}.tableHeaderContainer {- --cell-bg-color: var(--mb-color-background-light);- --cell-hover-bg-color: var(--mb-color-background-light);+ --cell-bg-color: var(--mb-color-background-secondary);+ --cell-hover-bg-color: var(--mb-color-background-secondary);- background-color: var(--mb-color-background-light);+ background-color: var(--mb-color-background-secondary);& .tableRow {background-color: transparent;@@ -29,6 +29,7 @@.tableHeaderCell {border-right: 1px solid var(--mb-color-border);font-weight: 700;+ background-color: var(--cell-bg-color);&:hover {color: var(--mb-color-brand);@@ -36,11 +37,11 @@}.tableBodyContainer {- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);}.tableBodyCell {- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);border-right: 1px solid var(--mb-color-border);}diff --git a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/data-grid/TableEditingCell.module.css b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/data-grid/TableEditingCell.module.cssindex 3ff5c98d259..a7e523cf847 100644--- a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/data-grid/TableEditingCell.module.css+++ b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/data-grid/TableEditingCell.module.css@@ -4,7 +4,7 @@outline-offset: -2px;border-color: transparent;box-sizing: border-box;- background-color: var(--mb-color-background);+ background-color: var(--mb-color-background-primary);border-radius: 0;text-overflow: ellipsis;white-space: nowrap;@@ -34,28 +34,28 @@.readonlyCell {font-weight: normal;- color: var(--mb-color-text-disabled);+ color: var(--mb-color-text-tertiary);cursor: not-allowed;border-bottom-color: var(--mb-color-border);}.errorCell {- background-color: var(--mb-color-bg-yellow);+ background-color: var(--mb-color-background-warning);outline: 2px solid var(--mb-color-warning);outline-offset: -2px;border-radius: 0.25rem;&:hover {- background-color: var(--mb-color-bg-yellow);+ background-color: var(--mb-color-background-warning);}}.updatingCell {background: linear-gradient(110deg,- var(--mb-color-bg-light) 8%,- var(--mb-color-bg-white) 18%,- var(--mb-color-bg-light) 33%+ var(--mb-color-background-secondary) 8%,+ var(--mb-color-background-primary) 18%,+ var(--mb-color-background-secondary) 33%);background-size: 200% 100%;animation: 1s shine linear infinite;diff --git a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/data-grid/use-table-column-row-select.tsx b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/data-grid/use-table-column-row-select.tsxindex 909f5b731ff..4b3160d209c 100644--- a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/data-grid/use-table-column-row-select.tsx+++ b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/data-grid/use-table-column-row-select.tsx@@ -31,13 +31,7 @@ export function getRowSelectColumn({name: "",accessorFn: () => null,header: ({ table }: { table: Table<RowValues> }) => (- <Flex- p="0.75rem"- h="100%"- align="center"- bg="var(--cell-bg-color)"- className={S.tableHeaderCell}- >+ <Flex p="0.75rem" h="100%" align="center" className={S.tableHeaderCell}><Checkboxsize={rem(16)}checked={table.getIsAllRowsSelected()}diff --git a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/modals/TableActionFormModal.module.css b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/modals/TableActionFormModal.module.cssindex c2b5026a7a7..fdeaf6f0924 100644--- a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/modals/TableActionFormModal.module.css+++ b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/modals/TableActionFormModal.module.css@@ -8,7 +8,7 @@}.modalHeader {- background-color: var(--mb-color-background);+ background-color: var(--mb-color-background-primary);border-bottom: 1px solid var(--mb-color-border);height: rem(80);padding-top: 0;@@ -37,7 +37,7 @@}.modalFooter {- background-color: var(--mb-color-background);+ background-color: var(--mb-color-background-primary);border-top: 1px solid var(--mb-color-border);height: rem(72);align-items: center;diff --git a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/toasts/ErrorUpdateToast.tsx b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/toasts/ErrorUpdateToast.tsxindex f92f669c033..af88ed286b3 100644--- a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/toasts/ErrorUpdateToast.tsx+++ b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/toasts/ErrorUpdateToast.tsx@@ -32,10 +32,10 @@ export const ErrorUpdateToast = ({ error }: ErrorUpdateToastProps) => {return (<Box w="18rem"><Text- c="text-white"+ c="text-primary-inverse"fw={700}>{t`Editing unavailable: no PK defined`}</Text>- <Text c="text-white">{jt`Add a primary key in your database or set an ${(+ <Text c="text-primary-inverse">{jt`Add a primary key in your database or set an ${(<Anchorcomponent={Link}to={`/data-studio/data/database/${table?.db_id}/schema/${table?.schema}/table/${table?.id}`}@@ -52,8 +52,8 @@ export const ErrorUpdateToast = ({ error }: ErrorUpdateToastProps) => {if (showDetails) {return (<Stack gap="0.5rem" w="30rem" maw="100%">- <Text c="text-white">{t`Couldn't save table changes:`}</Text>- <Text c="text-white" style={{ fontFamily: "monospace" }}>+ <Text c="text-primary-inverse">{t`Couldn't save table changes:`}</Text>+ <Text c="text-primary-inverse" style={{ fontFamily: "monospace" }}>{errorMessage}</Text></Stack>@@ -64,12 +64,15 @@ export const ErrorUpdateToast = ({ error }: ErrorUpdateToastProps) => {<Group gap="2.5rem" w="20rem"><Group gap="0.5rem"><Icon name="warning" c="danger" size={12} />- <Text c="text-white" fw={700}>{t`Couldn't save table changes`}</Text>+ <Text+ c="text-primary-inverse"+ fw={700}+ >{t`Couldn't save table changes`}</Text></Group><Buttonsize="compact-lg"- color="bg-darker"+ c="background-secondary-inverse"variant="filled"autoContrastradius="0.5rem"diff --git a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/toasts/use-table-editing-toast-controller.tsx b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/toasts/use-table-editing-toast-controller.tsxindex 628c4e9bb96..35d6f52ba45 100644--- a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/toasts/use-table-editing-toast-controller.tsx+++ b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/toasts/use-table-editing-toast-controller.tsx@@ -24,7 +24,7 @@ export function useTableEditingToastController() {showErrorToast(error: unknown, onDismiss?: () => void) {dispatch(addUndo({- toastColor: "bg-black",+ toastColor: "background-primary-inverse",icon: null,renderChildren: () => <ErrorUpdateToast error={error} />,timeout: null, // removes automatic toast hidediff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/MainNavSharedCollections/MainNavSharedCollections.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/MainNavSharedCollections/MainNavSharedCollections.tsxindex 2dfeff49af9..ccdee7ccc60 100644--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/MainNavSharedCollections/MainNavSharedCollections.tsx+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/MainNavSharedCollections/MainNavSharedCollections.tsx@@ -122,7 +122,7 @@ export const MainNavSharedCollections = ({{canCreateSharedCollection && (<Tooltip label={t`Create a shared collection`}><ActionIcon- color="text-medium"+ c="text-secondary"onClick={() => setModalOpen(true)}><Icon name="add" />diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantGroupHintIcon.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantGroupHintIcon.tsxindex f6455d6816c..4eb38385643 100644--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantGroupHintIcon.tsx+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantGroupHintIcon.tsx@@ -4,6 +4,6 @@ import { Icon, Tooltip } from "metabase/ui";export const TenantGroupHintIcon = () => (<Tooltip label={t`This is a tenant group`}>- <Icon name="globe" c="text-medium" />+ <Icon name="globe" c="text-secondary" /></Tooltip>);diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantsListing/TenantsListing.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantsListing/TenantsListing.tsxindex 4d771e1ae29..09cb9e82bc2 100644--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantsListing/TenantsListing.tsx+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantsListing/TenantsListing.tsx@@ -117,13 +117,13 @@ export const TenantsListing = ({{((tenants.length !== 0 && filteredTenants.length === 0) ||(tenants.length === 0 && status === ACTIVE_STATUS.deactivated)) && (- <Text size="lg" fw="700" ta="center" mt="xl" py="xl" c="text-light">+ <Text size="lg" fw="700" ta="center" mt="xl" py="xl" c="text-tertiary">{t`No matching tenants found.`}</Text>)}{tenants.length === 0 && status === ACTIVE_STATUS.active && (- <Text size="lg" fw="700" ta="center" mt="xl" py="xl" c="text-light">+ <Text size="lg" fw="700" ta="center" mt="xl" py="xl" c="text-tertiary">{t`Add your first tenant to get started.`}</Text>)}@@ -142,7 +142,7 @@ function ActionsPopover({ tenant }: ActionsPopoverProps) {<Menu shadow="md" width={200} position="bottom-end"><Menu.Target><UnstyledButton>- <Icon c="text-light" name="ellipsis" />+ <Icon c="text-tertiary" name="ellipsis" /></UnstyledButton></Menu.Target><Menu.Dropdown>diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantsListingEmptyState.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantsListingEmptyState.tsxindex 7b37a017b75..20c58ff52f7 100644--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantsListingEmptyState.tsx+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantsListingEmptyState.tsx@@ -10,7 +10,7 @@ export const TenantsListingEmptyState = ({}) => (<Flex justify="space-between" align="center" gap="lg"><Box flex="1">- <Text size="md" c="text-dark">+ <Text size="md" c="text-primary">{c("{0} links to external users, {1} links to groups, {2} links to permissions",).jt`Create your first tenant to start adding ${(diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonDataPicker/AliasInput/AliasInput.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonDataPicker/AliasInput/AliasInput.tsxindex 933f49dd400..6a4ffd3d29f 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonDataPicker/AliasInput/AliasInput.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonDataPicker/AliasInput/AliasInput.tsx@@ -53,7 +53,7 @@ export function AliasInput({<ActionIcononClick={() => onChange(defaultAlias)}aria-label={t`Reset alias to default`}- color="gray"+ color="text-tertiary"variant="subtle"><Icon name="refresh" size={12} />diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonDataPicker/PythonDataPicker.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonDataPicker/PythonDataPicker.tsxindex be5db6e174e..e9b2178b7f3 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonDataPicker/PythonDataPicker.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonDataPicker/PythonDataPicker.tsx@@ -153,7 +153,7 @@ export function PythonDataPicker({><Box><Text fw="bold">{t`Source database`}</Text>- <Text size="sm" c="text-light" mb="sm">+ <Text size="sm" c="text-tertiary" mb="sm">{t`Select the database that contains your source data.`}</Text>@@ -171,7 +171,7 @@ export function PythonDataPicker({{database && (<Box><Text fw="bold">{t`Pick tables and alias them`}</Text>- <Text size="sm" c="text-light" mb="sm">+ <Text size="sm" c="text-tertiary" mb="sm">{t`Select tables to use as data sources and provide aliases that can be referenced in your Python script.`}</Text><Stack gap="md">diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonDataPicker/TableSelector/TableSelector.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonDataPicker/TableSelector/TableSelector.tsxindex 716d1293844..5ae642dd8b0 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonDataPicker/TableSelector/TableSelector.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonDataPicker/TableSelector/TableSelector.tsx@@ -85,13 +85,13 @@ export function TableSelector({<Stack gap={0} align="start" justify="center">{table ? (<>- <Box fz="sm" c="text-medium" fw="normal">+ <Box fz="sm" c="text-secondary" fw="normal">{table?.db?.name} / {table?.schema}</Box>- <Box c="text-dark">{table?.display_name}</Box>+ <Box c="text-primary">{table?.display_name}</Box></>) : (- <Box c="text-dark">{t`Select a table…`}</Box>+ <Box c="text-primary">{t`Select a table…`}</Box>)}</Stack></Button>@@ -102,7 +102,7 @@ export function TableSelector({pr="sm"aria-label={t`Remove this table`}>- <Icon name="close" c="text-dark" />+ <Icon name="close" c="text-primary" /></ActionIcon></Tooltip></Group>diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorBody/PythonEditorBody.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorBody/PythonEditorBody.tsxindex e7ed914c49a..eae4df5e569 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorBody/PythonEditorBody.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorBody/PythonEditorBody.tsx@@ -55,7 +55,7 @@ export function PythonEditorBody({}: PythonEditorBodyProps) {return (<MaybeResizableBox resizable={withDebugger}>- <Flex h="100%" align="end" bg="bg-light" pos="relative">+ <Flex h="100%" align="end" bg="background-secondary" pos="relative"><PythonEditorvalue={source}proposedValue={proposedSource}@@ -170,7 +170,7 @@ function SharedLibraryImportButton({return (<Tooltip label={label}><ActionIcon aria-label={label} onClick={handleToggleSharedLib}>- <Icon name="reference" c="text-dark" />+ <Icon name="reference" c="text-primary" /></ActionIcon></Tooltip>);@@ -187,7 +187,7 @@ function SharedLibraryEditLink() {aria-label={label}to={Urls.transformPythonLibrary({ path: SHARED_LIB_IMPORT_PATH })}>- <Icon name="pencil" c="text-dark" />+ <Icon name="pencil" c="text-primary" /></ActionIcon></Tooltip>);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.cssindex 3b752132b61..c609ede35db 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@@ -21,7 +21,7 @@}.tableHeader {- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);padding: var(--mantine-spacing-sm);}@@ -40,7 +40,7 @@}.error {- background-color: var(--mb-color-bg-error);+ background-color: var(--mb-color-background-error);}.traceback {diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorResults/PythonEditorResults.tsx b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorResults/PythonEditorResults.tsxindex b7ce58e8d7b..9acf42606ac 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorResults/PythonEditorResults.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorResults/PythonEditorResults.tsx@@ -104,7 +104,7 @@ function EmptyState() {<Box maw="3rem" mb="0.75rem"><img src={EmptyCodeResult} alt="Code prompt icon" /></Box>- <Text c="text-medium">+ <Text c="text-secondary">{c("{0} refers to the keyboard shortcut").jt`To run your code, click on the Run button or type ${(<b key="shortcut">({keyboardShortcut})</b>@@ -159,11 +159,15 @@ function ExecutionOutputLogs({executionResult: TestPythonTransformResponse | null;}) {return (- <Box fz="sm" p="md" bg="bg-light" h="100%" className={S.logs}>+ <Box fz="sm" p="md" bg="background-secondary" h="100%" className={S.logs}>{executionResult?.logs ? (<AnsiLogs>{executionResult.logs}</AnsiLogs>) : (- <Text c="text-light" fz="sm" fs="italic">{t`No logs to display`}</Text>+ <Text+ c="text-tertiary"+ fz="sm"+ fs="italic"+ >{t`No logs to display`}</Text>)}</Box>);diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorPage.module.css b/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorPage.module.cssindex d08a0bde78f..c9b86585db4 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorPage.module.css+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/pages/PythonLibraryEditorPage/PythonLibraryEditorPage.module.css@@ -2,5 +2,5 @@/* HACK: 133px is the height of the headers */height: calc(100vh - 133px);flex-grow: 1;- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);}diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/ColumnLayout/ColumnLayout.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/ColumnLayout/ColumnLayout.tsxindex 0548b49a093..8835e0b6935 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/ColumnLayout/ColumnLayout.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/ColumnLayout/ColumnLayout.tsx@@ -34,7 +34,7 @@ export function ColumnLayoutBody({ children }: ColumnLayoutBodyProps) {pt="3.5rem"pb="xl"px="xl"- bg="bg-light"+ bg="background-secondary"><Stack flex={1} gap="3.5rem" maw="50rem">{children}diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/RunButton/RunButton.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/RunButton/RunButton.tsxindex f160fdc8875..c318f6ff6ca 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/RunButton/RunButton.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/RunButton/RunButton.tsx@@ -7,6 +7,7 @@ import {} from "react";import { t } from "ttag";+import type { ColorName } from "metabase/lib/colors/types";import { Button, Icon, Loader, Tooltip } from "metabase/ui";import type {TransformId,@@ -87,7 +88,7 @@ type RunButtonOpts = {type RunButtonInfo = {label: string;- color?: string;+ color?: ColorName;leftSection?: ReactNode;isDisabled?: boolean;};@@ -134,8 +135,8 @@ function getRunButtonInfo({if (run.status === "canceled") {return {label: t`Canceled`,- color: "var(--mb-color-warning)",- leftSection: <Icon name="close" color="white" aria-hidden />,+ color: "warning",+ leftSection: <Icon name="close" c="white" aria-hidden />,isDisabled,};}diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/TagList/TagList.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/TagList/TagList.tsxindex fb23ae978b7..2be90fa5b77 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/TagList/TagList.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/TagList/TagList.tsx@@ -14,7 +14,7 @@ export function TagList({ tagIds, tags }: TagListProps) {return (<Group gap="sm">{getTagList(tagIds, tagById).map((tag) => (- <Pill key={tag.id} c="text-dark" bg="bg-medium">+ <Pill key={tag.id} c="text-primary" bg="background-tertiary">{tag.name}</Pill>))}diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobEmptyPage/JobEmptyPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobEmptyPage/JobEmptyPage.tsxindex a51fc51b3e3..4f87b3c3043 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobEmptyPage/JobEmptyPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/JobEmptyPage/JobEmptyPage.tsx@@ -6,7 +6,7 @@ import { Center } from "metabase/ui";export function JobEmptyPage() {return (- <Center h="100%" bg="bg-light">+ <Center h="100%" bg="background-secondary"><EmptyStateillustrationElement={<img src={EmptyDashboardBot} />}title={t`Pick a job or create a new one`}diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformPage/NewTransformPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformPage/NewTransformPage.tsxindex 0cc2468075d..89c23b67252 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformPage/NewTransformPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformPage/NewTransformPage.tsx@@ -150,7 +150,7 @@ function NewTransformPageBody({/><Boxw="100%"- bg="bg-white"+ bg="background-primary"bdrs="md"bd="1px solid var(--mb-color-border)"flex={1}diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/FilterFieldSet/FilterFieldSet.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/FilterFieldSet/FilterFieldSet.tsxindex a76f24f3069..556e9dbaccc 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/FilterFieldSet/FilterFieldSet.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterList/FilterFieldSet/FilterFieldSet.tsx@@ -48,7 +48,7 @@ export const FilterFieldSet = forwardRef(function FilterWidget(pr="xs"py="xs"bd="2px solid border"- bg="bg-white"+ bg="background-primary"aria-label={label}>{hasValue && (diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/TagList/TagList.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/TagList/TagList.tsxindex 2320de11b5c..0dd83404c34 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/TagList/TagList.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunList/TagList/TagList.tsx@@ -14,7 +14,7 @@ export function TagList({ tagIds, tags }: TagListProps) {return (<Group gap="sm">{getTagList(tagIds, tagById).map((tag) => (- <Pill key={tag.id} c="text-dark" bg="bg-medium">+ <Pill key={tag.id} c="text-primary" bg="background-secondary">{tag.name}</Pill>))}diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformEmptyPage/TransformEmptyPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformEmptyPage/TransformEmptyPage.tsxindex c7c96809eb7..db08688b28a 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformEmptyPage/TransformEmptyPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformEmptyPage/TransformEmptyPage.tsx@@ -6,7 +6,7 @@ import { Center } from "metabase/ui";export function TransformEmptyPage() {return (- <Center h="100%" bg="bg-light">+ <Center h="100%" bg="background-secondary"><EmptyStateillustrationElement={<img src={EmptyDashboardBot} />}title={t`Pick a transform or create a new one`}diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformListPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformListPage.tsxindex a8c2b97c783..1016a63b786 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformListPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformListPage.tsx@@ -13,6 +13,7 @@ import DateTime from "metabase/common/components/DateTime";import { Ellipsified } from "metabase/common/components/Ellipsified";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import CS from "metabase/css/core/index.css";+import type { ColorName } from "metabase/lib/colors/types";import { useDispatch } from "metabase/lib/redux";import * as Urls from "metabase/lib/urls";import { PLUGIN_TRANSFORMS_PYTHON } from "metabase/plugins";@@ -56,10 +57,10 @@ const countTransforms = (node: TreeNode): number => {}, 0);};-const NODE_ICON_COLORS: Record<TreeNode["nodeType"], string> = {- folder: "text-medium",+const NODE_ICON_COLORS: Record<TreeNode["nodeType"], ColorName> = {+ folder: "text-secondary",transform: "brand",- library: "text-dark",+ library: "text-primary",};const getNodeIconColor = (node: TreeNode) => NODE_ICON_COLORS[node.nodeType];diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformQueryPage/TransformQueryPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformQueryPage/TransformQueryPage.tsxindex 9f4361536fe..656bd636200 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformQueryPage/TransformQueryPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformQueryPage/TransformQueryPage.tsx@@ -178,7 +178,7 @@ function TransformQueryPageBody({/><Boxw="100%"- bg="bg-white"+ bg="background-primary"bdrs="md"bd="1px solid var(--mb-color-border)"flex={1}diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformRunPage/RunSection/LogOutput/LogOutput.modules.css b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformRunPage/RunSection/LogOutput/LogOutput.modules.cssindex e2c84ad8653..469b4179e7b 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformRunPage/RunSection/LogOutput/LogOutput.modules.css+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformRunPage/RunSection/LogOutput/LogOutput.modules.css@@ -1,5 +1,5 @@.logOutput {- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);font-family: var(--mb-default-monospace-font-family);white-space: pre;padding: 1rem;diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformRunPage/RunSection/LogOutput/LogOutput.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformRunPage/RunSection/LogOutput/LogOutput.tsxindex 8e3b9497925..1078c9ba50a 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformRunPage/RunSection/LogOutput/LogOutput.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformRunPage/RunSection/LogOutput/LogOutput.tsx@@ -56,7 +56,7 @@ export function LogOutput({ content }: LogOutputProps) {onScroll={handleScroll}mah="12rem"p="sm"- bg="bg-light"+ bg="background-secondary"fz="xs"data-css-specificity-hack=""data-testid="log-output"diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformRunPage/RunSection/RunSection.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformRunPage/RunSection/RunSection.tsxindex 1c7bd5bd19f..055053746c2 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformRunPage/RunSection/RunSection.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformRunPage/RunSection/RunSection.tsx@@ -64,7 +64,7 @@ function RunStatusSection({ transform }: RunStatusSectionProps) {const runExtra = status === "succeeded" && previousStatus === "canceling" && (<Box- c="text-light"+ c="text-tertiary"ml="lg">{t`This run succeeded before it had a chance to cancel.`}</Box>);diff --git a/enterprise/frontend/src/metabase-enterprise/upload_management/UploadManagementTable.tsx b/enterprise/frontend/src/metabase-enterprise/upload_management/UploadManagementTable.tsxindex 42d92bd0306..e476e31e6c8 100644--- a/enterprise/frontend/src/metabase-enterprise/upload_management/UploadManagementTable.tsx+++ b/enterprise/frontend/src/metabase-enterprise/upload_management/UploadManagementTable.tsx@@ -142,7 +142,7 @@ export function UploadManagementTable() {</BulkActionBar>)}<SettingHeader id="upload-tables-list" title={t`Manage uploads`} />- <Text fw="bold" c="text-medium">+ <Text fw="bold" c="text-secondary">{t`Uploaded tables`}</Text><ClientSortableTable@@ -204,7 +204,7 @@ const UploadTableRow = ({onClick={() => onTrash(item)}variant="subtle"className="Button Button--borderless"- color="text-medium"+ color="text-secondary"><Icon name="trash" /></Button>diff --git a/enterprise/frontend/src/metabase-enterprise/user_provisioning/components/ScimInputs.tsx b/enterprise/frontend/src/metabase-enterprise/user_provisioning/components/ScimInputs.tsxindex 60ed2aa6c83..cf0f6415cbb 100644--- a/enterprise/frontend/src/metabase-enterprise/user_provisioning/components/ScimInputs.tsx+++ b/enterprise/frontend/src/metabase-enterprise/user_provisioning/components/ScimInputs.tsx@@ -17,7 +17,10 @@ export const getTextInputStyles = (params: {},input: {color: match(params)- .with({ disabled: false }, () => `var(--mb-color-text-dark) !important`)+ .with(+ { disabled: false },+ () => `var(--mb-color-text-primary) !important`,+ ).otherwise(() => `var(--mb-color-text-primary) !important`),fontFamily: fontFamilyMonospace,},diff --git a/enterprise/frontend/src/metabase-enterprise/user_provisioning/components/ScimTextWarning.tsx b/enterprise/frontend/src/metabase-enterprise/user_provisioning/components/ScimTextWarning.tsxindex 6b908c3f290..0c75552e511 100644--- a/enterprise/frontend/src/metabase-enterprise/user_provisioning/components/ScimTextWarning.tsx+++ b/enterprise/frontend/src/metabase-enterprise/user_provisioning/components/ScimTextWarning.tsx@@ -5,7 +5,7 @@ export const ScimTextWarning = ({}: {children: React.ReactNode;}) => (- <Flex my=".25rem" gap="sm" align="start" c="text-medium">+ <Flex my=".25rem" gap="sm" align="start" c="text-secondary"><Box mt=".25rem"><FixedSizeIcon name="info" /></Box>diff --git a/enterprise/frontend/src/metabase-enterprise/user_provisioning/components/UserProvisioningModals.tsx b/enterprise/frontend/src/metabase-enterprise/user_provisioning/components/UserProvisioningModals.tsxindex 4cedf670a7a..de276c80766 100644--- a/enterprise/frontend/src/metabase-enterprise/user_provisioning/components/UserProvisioningModals.tsx+++ b/enterprise/frontend/src/metabase-enterprise/user_provisioning/components/UserProvisioningModals.tsx@@ -34,7 +34,7 @@ export const UserProvisioningFirstEnabledModal = ({title={t`Here's what you'll need to set SCIM up`}><Stack gap="lg">- <Text c="text-medium">+ <Text c="text-secondary">{t`To set up SCIM-based provisioning, you'll need to share this endpoint URL and token with your identity provider.`}</Text><CopyScimInput label={t`SCIM endpoint URL`} value={scimBaseUrl} />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.tsxindex fb2d2ab3780..5ca6abb9072 100644--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/BrandColorSettings/BrandColorSettings.styled.tsx+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/BrandColorSettings/BrandColorSettings.styled.tsx@@ -15,7 +15,7 @@ export const TableHeader = styled.div`border: 1px solid var(--mb-color-border);border-bottom: none;border-radius: 0.5rem 0.5rem 0 0;- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);`;export const TableHeaderRow = styled.div`@@ -25,7 +25,7 @@ export const TableHeaderRow = styled.div`export const TableHeaderCell = styled.div`${cellStyles};- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);font-size: 0.6rem;letter-spacing: 1px;line-height: 0.625rem;@@ -52,7 +52,7 @@ export const TableBodyRow = styled.div`export const TableBodyCell = styled.div`${cellStyles};- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);padding-top: 1rem;padding-bottom: 1rem;`;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.tsxindex 80348f53047..fb6eaae198d 100644--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ChartColorSettings/ChartColorSettings.styled.tsx+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ChartColorSettings/ChartColorSettings.styled.tsx@@ -21,7 +21,7 @@ export const TableBodyCell = styled.div`&:not(:first-of-type) {border-left: 1px solid var(--mb-color-border);- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);}`;diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ColorSettings/ColorSettings.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ColorSettings/ColorSettings.unit.spec.tsxindex 79f400555cb..11b065b8e21 100644--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ColorSettings/ColorSettings.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ColorSettings/ColorSettings.unit.spec.tsx@@ -8,8 +8,10 @@ import { color } from "metabase/lib/colors/palette";import { ColorSettings } from "./ColorSettings";describe("ColorSettings", () => {- const textMediumHex = Color(color("text-medium", staticVizOverrides)).hex();- const textLightHex = Color(color("text-light", staticVizOverrides)).hex();+ const textMediumHex = Color(+ color("text-secondary", staticVizOverrides),+ ).hex();+ const textLightHex = Color(color("text-tertiary", staticVizOverrides)).hex();const initialColors = {brand: color("filter"),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.tsxindex 93b46c774ab..def86f09120 100644--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/FontWidget/FontFilesWidget.styled.tsx+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/FontWidget/FontFilesWidget.styled.tsx@@ -23,7 +23,7 @@ export const TableHeader = styled.div`border: 1px solid var(--mb-color-border);border-bottom: none;border-radius: 0.5rem 0.5rem 0 0;- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);`;export const TableHeaderRow = styled.div`@@ -33,7 +33,7 @@ export const TableHeaderRow = styled.div`export const TableHeaderCell = styled.div`${cellStyles};- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);font-size: 0.6rem;letter-spacing: 1px;line-height: 0.625rem;@@ -64,13 +64,13 @@ interface TableBodyCellProps {export const TableBodyCell = styled.div<TableBodyCellProps>`${cellStyles};- color: var(--mb-color-text-medium);+ 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-light);+ color: var(--mb-color-text-tertiary);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.tsxindex 5088a41ddf0..62cbdc6aae0 100644--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/FontWidget/FontFilesWidget.tsx+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/FontWidget/FontFilesWidget.tsx@@ -52,7 +52,7 @@ export const FontFilesWidget = () => {return (<Stack mt="md" gap="sm">- <Text c="text-medium">{fontFilesDescription}</Text>+ <Text c="text-secondary">{fontFilesDescription}</Text><FontFilesTable urls={urls} onChange={handleChange} /></Stack>);diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/IllustrationWidget/IllustrationWidget.tsx b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/IllustrationWidget/IllustrationWidget.tsxindex 6978cd3af38..c57f2ff32ae 100644--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/IllustrationWidget/IllustrationWidget.tsx+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/IllustrationWidget/IllustrationWidget.tsx@@ -252,7 +252,7 @@ export function IllustrationWidget({<ButtonleftSection={<Icon name="close" />}variant="subtle"- c="text-dark"+ c="text-primary"ml="md"size="compact-md"onClick={handleRemoveCustomIllustration}diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/IllustrationWidget/ImageUploadWidget.tsx b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/IllustrationWidget/ImageUploadWidget.tsxindex 5c923345fea..f77027f6846 100644--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/IllustrationWidget/ImageUploadWidget.tsx+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/IllustrationWidget/ImageUploadWidget.tsx@@ -133,7 +133,7 @@ export function ImageUploadWidget({<ButtonleftSection={<Icon name="close" />}variant="subtle"- c="text-dark"+ c="text-primary"ml="md"size="compact-md"onClick={handleRemove}diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ImageUploadInfoDot.tsx b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ImageUploadInfoDot.tsxindex 72c79cd397d..17becfd7b98 100644--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ImageUploadInfoDot.tsx+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ImageUploadInfoDot.tsx@@ -1,4 +1,3 @@-import { useTheme } from "@emotion/react";import { t } from "ttag";import { HoverCard, Icon, Stack, Text } from "metabase/ui";@@ -30,11 +29,10 @@ const DESCRIPTIONS: Record<IllustrationType, string[]> = {};export const ImageUploadInfoDot = ({ type }: CustomFileUploadInfoDot) => {- const theme = useTheme();return (<HoverCard position="top-start"><HoverCard.Target>- <Icon name="info" color={theme.fn.themeColor("text-light")} />+ <Icon name="info" c="text-tertiary" /></HoverCard.Target><HoverCard.Dropdown><Stack p="md" gap="sm" maw={DESCRIPTIONS_WIDTHS[type]}>diff --git a/frontend/src/embedding-sdk-bundle/components/private/PublicComponentStylesWrapper.style.css b/frontend/src/embedding-sdk-bundle/components/private/PublicComponentStylesWrapper.style.cssindex 33c13510d47..d208f4d7a75 100644--- a/frontend/src/embedding-sdk-bundle/components/private/PublicComponentStylesWrapper.style.css+++ b/frontend/src/embedding-sdk-bundle/components/private/PublicComponentStylesWrapper.style.css@@ -8,7 +8,7 @@width: 100%;height: 100%;font-weight: 400;- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);font-family: var(--mb-default-font-family);-webkit-font-smoothing: antialiased;-moz-osx-font-smoothing: grayscale;diff --git a/frontend/src/embedding-sdk-bundle/components/private/PublicComponentWrapper/SdkError.tsx b/frontend/src/embedding-sdk-bundle/components/private/PublicComponentWrapper/SdkError.tsxindex aa87cdd4480..b3dc9746b08 100644--- a/frontend/src/embedding-sdk-bundle/components/private/PublicComponentWrapper/SdkError.tsx+++ b/frontend/src/embedding-sdk-bundle/components/private/PublicComponentWrapper/SdkError.tsx@@ -97,8 +97,8 @@ const FORCE_DARK_TEXT_COLOR = {// The Alert component has a light background, we need to force a dark text// color. The sdk aliases text-dark to the primary color, which in dark themes// is a light color, making the text un-readable- "--mb-color-text-dark": color("text-dark"),- "--mb-color-text-medium": color("text-medium"),+ "--mb-color-text-primary": color("text-primary"),+ "--mb-color-text-secondary": color("text-secondary"),} as CSSProperties;const DefaultErrorMessage = ({ message, onClose }: SdkErrorComponentProps) => (@@ -120,8 +120,8 @@ const ResourceNotFoundError = ({<SdkErrormessage={jt`${resource} ${(<Code- bg="var(--mb-color-background-error-secondary)"- c="var(--mb-color-text-medium)"+ bg="background-error-secondary"+ c="text-secondary"key="question-id">{id}diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkBreadcrumbs/SdkBreadcrumbs.module.css b/frontend/src/embedding-sdk-bundle/components/private/SdkBreadcrumbs/SdkBreadcrumbs.module.cssindex c7d583caacd..772d6a0220e 100644--- a/frontend/src/embedding-sdk-bundle/components/private/SdkBreadcrumbs/SdkBreadcrumbs.module.css+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkBreadcrumbs/SdkBreadcrumbs.module.css@@ -6,5 +6,5 @@margin-left: 0.5rem;margin-right: 0.5rem;user-select: none;- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);}diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkBreadcrumbs/SdkBreadcrumbs.tsx b/frontend/src/embedding-sdk-bundle/components/private/SdkBreadcrumbs/SdkBreadcrumbs.tsxindex 30d5a19d98a..00c5fb6940b 100644--- a/frontend/src/embedding-sdk-bundle/components/private/SdkBreadcrumbs/SdkBreadcrumbs.tsx+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkBreadcrumbs/SdkBreadcrumbs.tsx@@ -37,7 +37,7 @@ export const SdkBreadcrumbs = ({<Fragment key={breadcrumb.id}><Badgeicon={getBreadcrumbIcon(breadcrumb.type)}- inactiveColor="text-light"+ inactiveColor="text-tertiary"isSingleLineonClick={() => {navigateTo(breadcrumb);diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Breakout/BreakoutPicker/BreakoutPicker.tsx b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Breakout/BreakoutPicker/BreakoutPicker.tsxindex e0f6df47a4b..aa2722a56bd 100644--- a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Breakout/BreakoutPicker/BreakoutPicker.tsx+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Breakout/BreakoutPicker/BreakoutPicker.tsx@@ -32,7 +32,7 @@ export const BreakoutPickerInner = ({<Buttonp="md"fz="lg"- color="text-medium"+ color="text-secondary"variant="subtle"leftSection={<Icon name="chevronleft" />}onClick={() => onClose?.()}diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/EditorButton/EditorButton.module.css b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/EditorButton/EditorButton.module.cssindex e81451b246c..7c86023cde4 100644--- a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/EditorButton/EditorButton.module.css+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/EditorButton/EditorButton.module.css@@ -1,13 +1,13 @@.EditorButton:not([data-css-specificity-hack]) {color: var(--mb-color-text-primary);- background: var(--mb-color-background);+ background: var(--mb-color-background-primary);&:hover {background: var(--mb-color-background-hover);}&[data-active="true"] {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);background: var(--mb-color-brand);&:hover {diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/util/BadgeList/AddBadgeListItem/AddBadgeListItem.tsx b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/util/BadgeList/AddBadgeListItem/AddBadgeListItem.tsxindex 511115cc08e..7cc62dbf940 100644--- a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/util/BadgeList/AddBadgeListItem/AddBadgeListItem.tsx+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/util/BadgeList/AddBadgeListItem/AddBadgeListItem.tsx@@ -18,16 +18,16 @@ const _AddBadgeListItem = (classNames={{label: CS.cursorPointer,}}- bg="var(--mb-color-bg-light)"+ bg="background-secondary"tt="capitalize"size="lg"variant="transparent"- c="var(--mb-color-text-brand)"+ c="text-brand"pr="sm"pl="xs"leftSection={<ActionIcon radius="xl" size="sm" className={CS.bgMediumHover}>- <Icon name="add" c="var(--mb-color-text-brand)" size={10} />+ <Icon name="add" c="text-brand" size={10} /></ActionIcon>}{...rest}diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/util/BadgeList/BadgeList.tsx b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/util/BadgeList/BadgeList.tsxindex 553f5eae968..7af0f6d80f0 100644--- a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/util/BadgeList/BadgeList.tsx+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/util/BadgeList/BadgeList.tsx@@ -21,7 +21,7 @@ export const BadgeList = <T,>({onRemoveItem,addButtonLabel,}: BadgeListProps<T>) => (- <Paper p="md" w="30rem" bg="bg-white">+ <Paper p="md" w="30rem" bg="background-primary"><Group gap="sm">{items.map(({ name, item }, index) => (<BadgeListItemdiff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/util/BadgeList/BadgeListItem/BadgeListItem.tsx b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/util/BadgeList/BadgeListItem/BadgeListItem.tsxindex cbb0b20fa29..fb1330c8081 100644--- a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/util/BadgeList/BadgeListItem/BadgeListItem.tsx+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/util/BadgeList/BadgeListItem/BadgeListItem.tsx@@ -39,7 +39,7 @@ const _BadgeListItem = (className={S.BadgeListRemoveButton}data-testid="badge-remove-button">- <Icon name="close" c="var(--mb-color-text-brand)" size={10} />+ <Icon name="close" c="text-brand" size={10} /></ActionIcon>}{...rest}diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/styles/ToolbarButton.module.css b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/styles/ToolbarButton.module.cssindex c35fd696d34..9fdf08b9e00 100644--- a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/styles/ToolbarButton.module.css+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/styles/ToolbarButton.module.css@@ -1,5 +1,5 @@.PrimaryToolbarButton:not([data-css-specificity-hack]) {- background-color: var(--mb-color-background);+ background-color: var(--mb-color-background-primary);&:hover {background: var(--mb-color-background-hover);diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestionDefaultView/DefaultViewTitle.tsx b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestionDefaultView/DefaultViewTitle.tsxindex d6e395154fb..175ba677321 100644--- a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestionDefaultView/DefaultViewTitle.tsx+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestionDefaultView/DefaultViewTitle.tsx@@ -66,7 +66,7 @@ export const DefaultViewTitle = ({<DefaultViewTitleTexttitle={titleText && (- <Text fw={700} c="var(--mb-color-text-primary)" fz="xl">+ <Text fw={700} c="text-primary" fz="xl">{titleText}</Text>)@@ -85,7 +85,7 @@ export const DefaultViewTitle = ({return (<DefaultViewTitleTexttitle={- <Text fw={700} c="var(--mb-color-text-primary)" fz="xl">+ <Text fw={700} c="text-primary" fz="xl">{titleText}</Text>}diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestionDefaultView/SdkQuestionDefaultView.tsx b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestionDefaultView/SdkQuestionDefaultView.tsxindex 7749e5f5a5b..f5411f2ecfe 100644--- a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestionDefaultView/SdkQuestionDefaultView.tsx+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestionDefaultView/SdkQuestionDefaultView.tsx@@ -193,7 +193,7 @@ export const SdkQuestionDefaultView = ({{isEditorOpen ? (<PopoverBackButtononClick={toggleEditor}- color="brand"+ c="brand"fz="md"ml="sm">@@ -212,7 +212,6 @@ export const SdkQuestionDefaultView = ({<Dividermx="xs"orientation="vertical"- // we have to do this for now because Mantine's divider overrides this color no matter whatcolor="var(--mb-color-border) !important"/>)}diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkUsageProblem/SdkUsageProblemBanner.tsx b/frontend/src/embedding-sdk-bundle/components/private/SdkUsageProblem/SdkUsageProblemBanner.tsxindex 4a630cdb487..f229f00f851 100644--- a/frontend/src/embedding-sdk-bundle/components/private/SdkUsageProblem/SdkUsageProblemBanner.tsx+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkUsageProblem/SdkUsageProblemBanner.tsx@@ -20,7 +20,7 @@ export interface SdkUsageProblemBannerProps {// Prevent the usage problem banner from inheriting the theme colors,// so they remain legible even when the theme is changed.-const unthemedTextDark = originalColors["text-dark"];+const unthemedTextDark = originalColors["text-primary"];export const SdkUsageProblemBanner = ({problem,@@ -85,7 +85,6 @@ export const SdkUsageProblemBanner = ({{title}</Text></Flex>-<Text c={unthemedTextDark} ff={fontFamily} fz="sm">{problem.message}</Text>@@ -98,7 +97,7 @@ export const SdkUsageProblemBanner = ({size="md"radius="md"variant="subtle"- color="var(--mb-color-text-brand)"+ color="text-brand"onClick={() => {dispatch(setUsageProblem(null));}}diff --git a/frontend/src/embedding-sdk-bundle/components/public/SdkDebugInfo/SdkDebugInfo.module.css b/frontend/src/embedding-sdk-bundle/components/public/SdkDebugInfo/SdkDebugInfo.module.cssindex 2cb0b10b885..4488e5c5b44 100644--- a/frontend/src/embedding-sdk-bundle/components/public/SdkDebugInfo/SdkDebugInfo.module.css+++ b/frontend/src/embedding-sdk-bundle/components/public/SdkDebugInfo/SdkDebugInfo.module.css@@ -8,7 +8,11 @@gap: 10px;padding: 1rem;backdrop-filter: blur(6px);- background: color-mix(in srgb, var(--mb-color-bg-white) 60%, transparent);+ background: color-mix(+ in srgb,+ var(--mb-color-background-primary) 60%,+ transparent+ );font-size: 12px;text-align: left;}diff --git a/frontend/src/embedding-sdk-bundle/components/public/SdkQuestion/SdkQuestion.stories.tsx b/frontend/src/embedding-sdk-bundle/components/public/SdkQuestion/SdkQuestion.stories.tsxindex fee375d03c9..a33d05ddc1f 100644--- a/frontend/src/embedding-sdk-bundle/components/public/SdkQuestion/SdkQuestion.stories.tsx+++ b/frontend/src/embedding-sdk-bundle/components/public/SdkQuestion/SdkQuestion.stories.tsx@@ -75,7 +75,7 @@ export default {const Template: StoryFn<SdkQuestionComponentProps> = (args) => {return (- <Box bg="var(--mb-color-background)" mih="100vh">+ <Box bg="background-primary" mih="100vh"><SdkQuestion {...args} /></Box>);@@ -96,7 +96,7 @@ export const Default = {export const WithEditableSqlParametersCustomLayout = {render(args: SdkQuestionComponentProps) {return (- <Box bg="var(--mb-color-background)" mih="100vh">+ <Box bg="background-primary" mih="100vh"><SdkQuestion {...args}><SdkQuestion.Title /><SdkQuestion.SqlParametersList />@@ -178,7 +178,7 @@ export const WithEditableSqlParametersCustomLayout = {export const EditorOnly = {render(args: SdkQuestionComponentProps) {return (- <Box bg="var(--mb-color-background)" mih="100vh">+ <Box bg="background-primary" mih="100vh"><SdkQuestion {...args}><SdkQuestion.Editor /></SdkQuestion>@@ -196,7 +196,7 @@ export const EditorOnly = {export const CreateQuestion = {render(args: SdkQuestionComponentProps) {return (- <Box bg="var(--mb-color-background)" mih="100vh">+ <Box bg="background-primary" mih="100vh"><SdkQuestion {...args} /></Box>);diff --git a/frontend/src/embedding-sdk-bundle/lib/theme/get-embedding-theme.unit.spec.ts b/frontend/src/embedding-sdk-bundle/lib/theme/get-embedding-theme.unit.spec.tsindex e1cdb2af90a..8d36b9b9437 100644--- a/frontend/src/embedding-sdk-bundle/lib/theme/get-embedding-theme.unit.spec.ts+++ b/frontend/src/embedding-sdk-bundle/lib/theme/get-embedding-theme.unit.spec.ts@@ -38,17 +38,13 @@ describe("Transform Embedding Theme Override", () => {fontFamily: "Roboto",colors: {brand: expect.arrayContaining(["hotpink"]),- "text-dark": expect.arrayContaining(["yellow"]),"text-primary": expect.arrayContaining(["yellow"]),- "text-light": expect.arrayContaining(["green"]),"text-tertiary": expect.arrayContaining(["green"]),- background: expect.arrayContaining(["orange"]),- "bg-primary": expect.arrayContaining(["orange"]),- "bg-white": expect.arrayContaining(["orange"]),- "bg-medium": expect.arrayContaining(["brown"]),- "bg-secondary": expect.arrayContaining(["brown"]),+ "background-primary": expect.arrayContaining(["orange"]),+ "background-tertiary": expect.arrayContaining(["brown"]),+ "background-secondary": expect.arrayContaining(["brown"]),"background-disabled": expect.arrayContaining(["pink"]),- "text-white": expect.arrayContaining(["white"]),+ "text-primary-inverse": expect.arrayContaining(["white"]),white: expect.arrayContaining(["white"]),focus: expect.arrayContaining(["blue"]),},@@ -69,11 +65,9 @@ describe("Transform Embedding Theme Override", () => {expect(theme).toEqual({fontFamily: "Roboto",colors: {- background: expect.arrayContaining(["green"]),- "bg-primary": expect.arrayContaining(["green"]),- "bg-white": expect.arrayContaining(["green"]),- "bg-medium": expect.arrayContaining(["green"]),- "bg-secondary": expect.arrayContaining(["green"]),+ "background-primary": expect.arrayContaining(["green"]),+ "background-tertiary": expect.arrayContaining(["green"]),+ "background-secondary": expect.arrayContaining(["green"]),},other: { fontSize: "14px", ...DEFAULT_EMBEDDED_COMPONENT_THEME },components: getEmbeddingComponentOverrides(),diff --git a/frontend/src/embedding-sdk-shared/lib/apply-theme-preset.ts b/frontend/src/embedding-sdk-shared/lib/apply-theme-preset.tsindex 1ad77698b22..77c48f9c70d 100644--- a/frontend/src/embedding-sdk-shared/lib/apply-theme-preset.ts+++ b/frontend/src/embedding-sdk-shared/lib/apply-theme-preset.ts@@ -8,14 +8,13 @@ import {SDK_TO_MAIN_APP_COLORS_MAPPING,} from "metabase/embedding-sdk/theme/embedding-color-palette";import { getColors, getDarkColors } from "metabase/lib/colors/colors";-import type { ColorName, ColorPalette } from "metabase/lib/colors/types";+import type { ColorPalette } from "metabase/lib/colors/types";const PRESET_SDK_COLORS: MappableSdkColor[] = ["background","background-hover","background-disabled","background-secondary",- "background-light","text-primary","text-secondary","text-tertiary",@@ -39,7 +38,7 @@ const getPresetColors = (preset: MetabaseThemePreset): MetabaseColors => {return Object.fromEntries(PRESET_SDK_COLORS.map((sdkColor) => {const mainAppColor = SDK_TO_MAIN_APP_COLORS_MAPPING[sdkColor][0];- return [sdkColor, palette[mainAppColor as ColorName]];+ return [sdkColor, palette[mainAppColor]];}),);};diff --git a/frontend/src/embedding-sdk-shared/lib/apply-theme-preset.unit.spec.ts b/frontend/src/embedding-sdk-shared/lib/apply-theme-preset.unit.spec.tsindex 951bb8422bf..34637a37359 100644--- a/frontend/src/embedding-sdk-shared/lib/apply-theme-preset.unit.spec.ts+++ b/frontend/src/embedding-sdk-shared/lib/apply-theme-preset.unit.spec.ts@@ -5,7 +5,6 @@ const PRESET_COLOR_KEYS = ["background-hover","background-disabled","background-secondary",- "background-light","text-primary","text-secondary","text-tertiary",diff --git a/frontend/src/metabase-types/api/collection.ts b/frontend/src/metabase-types/api/collection.tsindex 2ae106bcde8..a63a875e9ca 100644--- a/frontend/src/metabase-types/api/collection.ts+++ b/frontend/src/metabase-types/api/collection.ts@@ -68,7 +68,7 @@ export type CollectionInstanceAnaltyicsConfig = {type: CollectionType;name?: string;icon: IconName;- color?: string;+ color?: ColorName;tooltips?: Record<string, string>;};diff --git a/frontend/src/metabase-types/store/undo.ts b/frontend/src/metabase-types/store/undo.tsindex 29a8ef9bfdf..82f71a6fd43 100644--- a/frontend/src/metabase-types/store/undo.ts+++ b/frontend/src/metabase-types/store/undo.ts@@ -1,5 +1,6 @@import type { ReactNode, RefObject } from "react";+import type { ColorName } from "metabase/lib/colors/types";import type { IconName } from "metabase/ui";import type { DashCardId, DashboardTabId } from "metabase-types/api";@@ -14,12 +15,12 @@ export interface Undo {showProgress?: boolean;icon?: IconName | null;toastColor?: string;- iconColor?: string;+ iconColor?: ColorName;actionLabel?: string;canDismiss?: boolean;startedAt?: number;pausedAt?: number | null;- dismissIconColor?: string;+ dismissIconColor?: ColorName;extraInfo?: { dashcardIds?: DashCardId[]; tabId?: DashboardTabId } & Record<string,unknowndiff --git a/frontend/src/metabase/App.styled.tsx b/frontend/src/metabase/App.styled.tsxindex 9d0b9b79f07..26d276ce4da 100644--- a/frontend/src/metabase/App.styled.tsx+++ b/frontend/src/metabase/App.styled.tsx@@ -18,8 +18,8 @@ export const AppContentContainer = styled.div<{overflow: hidden;background-color: ${(props) =>props.isAdminApp- ? "var(--mb-color-bg-white)"- : "var(--mb-color-bg-primary)"};+ ? "var(--mb-color-background-primary)"+ : "var(--mb-color-background-primary)"};@media print {height: 100%;diff --git a/frontend/src/metabase/account/app/components/AccountHeader/AccountHeader.styled.tsx b/frontend/src/metabase/account/app/components/AccountHeader/AccountHeader.styled.tsxindex 04897ee34af..736dbca1309 100644--- a/frontend/src/metabase/account/app/components/AccountHeader/AccountHeader.styled.tsx+++ b/frontend/src/metabase/account/app/components/AccountHeader/AccountHeader.styled.tsx@@ -14,7 +14,7 @@ export const AccountHeaderRoot = styled.div`align-items: center;padding-top: var(--mantine-spacing-sm);border-bottom: 1px solid var(--mb-color-border);- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);${breakpointMinSmall} {padding-top: var(--mantine-spacing-md);@@ -40,7 +40,7 @@ export const HeaderTitle = styled.h2`export const HeaderSubtitle = styled.h3`text-align: center;- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);`;export const HeaderAvatar = styled(UserAvatar)`diff --git a/frontend/src/metabase/account/notifications/components/NotificationCard/DashboardNotificationCard.styled.tsx b/frontend/src/metabase/account/notifications/components/NotificationCard/DashboardNotificationCard.styled.tsxindex 72eb189a5a9..2d7a4dc1d7c 100644--- a/frontend/src/metabase/account/notifications/components/NotificationCard/DashboardNotificationCard.styled.tsx+++ b/frontend/src/metabase/account/notifications/components/NotificationCard/DashboardNotificationCard.styled.tsx@@ -9,7 +9,7 @@ export const NotificationCardRoot = styled.div`padding: 1rem 1.5rem;border: 1px solid var(--mb-color-border);border-radius: 6px;- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);&:not(:last-child) {margin-bottom: 1.25rem;@@ -27,7 +27,7 @@ export const NotificationDescription = styled.div``;export const NotificationMessage = styled.span`- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);font-size: 0.75rem;line-height: 0.875rem;@@ -38,12 +38,12 @@ export const NotificationMessage = styled.span``;export const NotificationIcon = styled(Icon)`- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);cursor: pointer;width: 1rem;height: 1rem;&:hover {- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);}`;diff --git a/frontend/src/metabase/account/notifications/components/NotificationCard/NotificationCard.tsx b/frontend/src/metabase/account/notifications/components/NotificationCard/NotificationCard.tsxindex cff793163ea..7dc5d0b8514 100644--- a/frontend/src/metabase/account/notifications/components/NotificationCard/NotificationCard.tsx+++ b/frontend/src/metabase/account/notifications/components/NotificationCard/NotificationCard.tsx@@ -64,7 +64,7 @@ export const NotificationCard = ({</Link><NotificationDescription><NotificationMessage>- <Group gap="0.75rem" align="center" c="text-medium">+ <Group gap="0.75rem" align="center" c="text-secondary">{enabledChannelsMap["channel/email"] && <Icon name="mail" />}{enabledChannelsMap["channel/slack"] && (<Icon name="slack" size={14} />@@ -72,7 +72,7 @@ export const NotificationCard = ({{enabledChannelsMap["channel/http"] && (<Icon name="webhook" size={16} />)}- <Group gap="0.25rem" align="center" c="text-medium">+ <Group gap="0.25rem" align="center" c="text-secondary">{subscription && (<span>{formatNotificationSchedule(subscription)}</span>)}diff --git a/frontend/src/metabase/account/notifications/components/NotificationList/NotificationList.styled.tsx b/frontend/src/metabase/account/notifications/components/NotificationList/NotificationList.styled.tsxindex d9d1961e40b..f4475801184 100644--- a/frontend/src/metabase/account/notifications/components/NotificationList/NotificationList.styled.tsx+++ b/frontend/src/metabase/account/notifications/components/NotificationList/NotificationList.styled.tsx@@ -22,7 +22,7 @@ export const NotificationSection = styled.div``;export const NotificationIcon = styled(Icon)`- color: var(--mb-color-bg-dark);+ color: var(--mb-color-background-tertiary-inverse);width: 3.25rem;height: 3.25rem;margin-top: 4.875rem;diff --git a/frontend/src/metabase/actions/components/ActionViz/ActionDashcardSettings.styled.tsx b/frontend/src/metabase/actions/components/ActionViz/ActionDashcardSettings.styled.tsxindex 870bc6ac329..a0db0278a5f 100644--- a/frontend/src/metabase/actions/components/ActionViz/ActionDashcardSettings.styled.tsx+++ b/frontend/src/metabase/actions/components/ActionViz/ActionDashcardSettings.styled.tsx@@ -23,7 +23,7 @@ const fade = (side: "top" | "bottom") => `pointer-events : none;background-image : linear-gradient( to ${side},transparent,- var(--mb-color-background) 90%);+ var(--mb-color-background-primary) 90%);height : 2rem;`;diff --git a/frontend/src/metabase/actions/components/ActionViz/ActionForm.styled.tsx b/frontend/src/metabase/actions/components/ActionViz/ActionForm.styled.tsxindex 2097411ef87..db9096ed911 100644--- a/frontend/src/metabase/actions/components/ActionViz/ActionForm.styled.tsx+++ b/frontend/src/metabase/actions/components/ActionViz/ActionForm.styled.tsx@@ -3,7 +3,7 @@ import styled from "@emotion/styled";export const FormWrapper = styled.div`padding: 1.5rem;- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);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.tsxindex d09ee5d812a..49a69207349 100644--- a/frontend/src/metabase/actions/components/ActionViz/ActionParameterMapping.styled.tsx+++ b/frontend/src/metabase/actions/components/ActionViz/ActionParameterMapping.styled.tsx@@ -12,7 +12,7 @@ interface ParameterFormLabelProps {}export const ParameterFormLabel = styled.label<ParameterFormLabelProps>`- color: ${(props) => (props.error ? color("error") : color("text-medium"))};+ color: ${(props) => (props.error ? color("error") : color("text-secondary"))};font-size: 0.75rem;display: flex;gap: var(--mantine-spacing-sm);@@ -22,8 +22,8 @@ export const ParameterFormLabel = styled.label<ParameterFormLabelProps>``;export const ParameterFormBadge = styled.span`- color: var(--mb-color-text-dark);- background-color: var(--mb-color-bg-medium);+ color: var(--mb-color-text-primary);+ background-color: var(--mb-color-background-tertiary);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.tsxindex 70d8ab281b2..fdc241c83bc 100644--- a/frontend/src/metabase/actions/components/ActionViz/ExplainerText/ExplainerText.styled.tsx+++ b/frontend/src/metabase/actions/components/ActionViz/ExplainerText/ExplainerText.styled.tsx@@ -6,7 +6,7 @@ import ExternalLink from "metabase/common/components/ExternalLink";export const ExplainerTextContainer = styled.p`margin-left: var(--mantine-spacing-xl);margin-right: var(--mantine-spacing-xl);- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);`;export const BrandLinkWithLeftMargin = styled(ExternalLink)`diff --git a/frontend/src/metabase/actions/containers/ActionCreator/ActionCreator.styled.tsx b/frontend/src/metabase/actions/containers/ActionCreator/ActionCreator.styled.tsxindex 29df653763e..114a05621f9 100644--- a/frontend/src/metabase/actions/containers/ActionCreator/ActionCreator.styled.tsx+++ b/frontend/src/metabase/actions/containers/ActionCreator/ActionCreator.styled.tsx@@ -19,7 +19,7 @@ export const ActionCreatorBodyContainer = styled.div`export const EditorContainer = styled.div`flex: 1 1 0;overflow-y: auto;- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);.ace_editor {margin-left: var(--mantine-spacing-md);@@ -68,7 +68,7 @@ export const ModalRight = styled.div`top: 0;padding: 1.5rem 1.5rem 0.5rem 1.5rem;margin: 0;- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);z-index: 5;}`;diff --git a/frontend/src/metabase/actions/containers/ActionCreator/ActionCreatorHeader.styled.tsx b/frontend/src/metabase/actions/containers/ActionCreator/ActionCreatorHeader.styled.tsxindex abd4402510a..fd721e498c3 100644--- a/frontend/src/metabase/actions/containers/ActionCreator/ActionCreatorHeader.styled.tsx+++ b/frontend/src/metabase/actions/containers/ActionCreator/ActionCreatorHeader.styled.tsx@@ -11,7 +11,7 @@ export const Container = styled.div`align-items: center;justify-content: space-between;width: 100%;- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);border-bottom: 1px solid var(--mb-color-border);padding: var(--mantine-spacing-md) var(--mantine-spacing-xl);`;@@ -19,14 +19,14 @@ export const Container = styled.div`export const LeftHeader = styled.div`display: flex;align-items: center;- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);gap: var(--mantine-spacing-md);`;export const EditableText = styled(EditableTextBase)`font-weight: bold;font-size: 1.3em;- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);`;export const CompactSelect = styled(Select)`@@ -34,7 +34,7 @@ export const CompactSelect = styled(Select)`border: none;border-radius: 6px;min-width: 80px;- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);}${SelectButton.Content} {margin-right: 6px;@@ -45,7 +45,7 @@ export const CompactSelect = styled(Select)`&:hover {${SelectButton.Root} {- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);}}`;diff --git a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/Description/Description.styled.tsx b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/Description/Description.styled.tsxindex e8fb4ded7a6..75946ebf40a 100644--- a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/Description/Description.styled.tsx+++ b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/Description/Description.styled.tsx@@ -2,5 +2,5 @@import styled from "@emotion/styled";export const InfoText = styled.div`- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);`;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.tsxindex 2b5f795d8c0..5e33046dbb3 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@@ -20,7 +20,7 @@ export const ExplainerTitle = styled.h3`export const ExplainerText = styled.div`font-weight: 400;line-height: 1.5rem;- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);margin: var(--mantine-spacing-sm) 0 0 0;`;@@ -31,7 +31,7 @@ export const ExplainerList = styled.ul`li {font-weight: 400;line-height: 24px;- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);margin: 0;}`;diff --git a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FieldSettingsPopover.styled.tsx b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FieldSettingsPopover.styled.tsxindex cd8f3e950a9..f589e6c9fa8 100644--- a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FieldSettingsPopover.styled.tsx+++ b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FieldSettingsPopover.styled.tsx@@ -24,7 +24,7 @@ export const ToggleContainer = styled.div``;export const SettingsTriggerIcon = styled(Icon)`- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);&:hover {color: var(--mb-color-brand);diff --git a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormCreator.styled.tsx b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormCreator.styled.tsxindex 6e23e62865c..1d1520709e5 100644--- a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormCreator.styled.tsx+++ b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormCreator.styled.tsx@@ -8,7 +8,7 @@ export const FormContainer = styled.div`gap: var(--mantine-spacing-md);padding: 0 1.5rem 1rem;transition: flex 500ms ease-in-out;- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);flex-direction: column;`;diff --git a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormFieldEditor/DragHandle.module.css b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormFieldEditor/DragHandle.module.cssindex 3f7dc36e920..0c0a2cdcb74 100644--- a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormFieldEditor/DragHandle.module.css+++ b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormFieldEditor/DragHandle.module.css@@ -1,5 +1,5 @@.dragHandle {- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);margin-top: 4px;cursor: grab;}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.tsxindex f226ad5d24d..6d4b0c91f4d 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@@ -6,7 +6,7 @@ import Radio from "metabase/common/components/Radio";import { darken } from "metabase/lib/colors";export const FormFieldContainer = styled.div`- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);border: 1px solid var(--mb-color-border);border-radius: var(--mantine-spacing-sm);overflow: hidden;@@ -44,20 +44,20 @@ export const Header = styled.div``;export const Title = styled.div`- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);font-weight: 700;`;export const Subtitle = styled.div`- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);font-size: 0.85rem;font-weight: 700;margin-top: 1.2rem;`;export const PreviewContainer = styled(ContentContainer)`- background-color: var(--mb-color-bg-light);- border-top: 1px solid ${() => darken("bg-light", 0.1)};+ background-color: var(--mb-color-background-secondary);+ border-top: 1px solid ${() => darken("background-secondary", 0.1)};padding: 1rem 1rem 2rem 1rem;${FormField.Root} {@@ -65,7 +65,7 @@ export const PreviewContainer = styled(ContentContainer)`}${FormField.Label} {- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);}`;diff --git a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/OptionEditor.styled.tsx b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/OptionEditor.styled.tsxindex 9c338dbcc23..22abe8ed055 100644--- a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/OptionEditor.styled.tsx+++ b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/OptionEditor.styled.tsx@@ -12,7 +12,7 @@ export const AddMorePrompt = styled.div<{ isVisible: boolean }>`text-align: center;font-size: 0.875rem;height: 1.25rem;- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);transition: opacity 0.2s ease-in-out;opacity: ${(props) => (props.isVisible ? 1 : 0)};`;diff --git a/frontend/src/metabase/actions/containers/ActionPicker/ActionPicker.styled.tsx b/frontend/src/metabase/actions/containers/ActionPicker/ActionPicker.styled.tsxindex 9c681cc2cc9..f8aa888b8f1 100644--- a/frontend/src/metabase/actions/containers/ActionPicker/ActionPicker.styled.tsx+++ b/frontend/src/metabase/actions/containers/ActionPicker/ActionPicker.styled.tsx@@ -44,12 +44,12 @@ export const EmptyState = styled(UnstyledEmptyState)`export const EmptyModelStateContainer = styled.div`padding: var(--mantine-spacing-md);- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);text-align: center;`;export const EditButton = styled(Button)`- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);padding: 0 0.5rem;`;diff --git a/frontend/src/metabase/admin/app/components/DeprecationNotice/DeprecationNotice.styled.tsx b/frontend/src/metabase/admin/app/components/DeprecationNotice/DeprecationNotice.styled.tsxindex ad3619771dd..2400383d84a 100644--- a/frontend/src/metabase/admin/app/components/DeprecationNotice/DeprecationNotice.styled.tsx+++ b/frontend/src/metabase/admin/app/components/DeprecationNotice/DeprecationNotice.styled.tsx@@ -8,13 +8,13 @@ export const NoticeRoot = styled.div`display: flex;padding: 1rem 1rem 1rem 1.5rem;align-items: center;- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);`;export const NoticeContent = styled.div`flex: 1 1 auto;margin: 0 0.75rem;- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);`;export const NoticeWarningIcon = styled(Icon)`@@ -24,7 +24,7 @@ export const NoticeWarningIcon = styled(Icon)``;export const NoticeCloseIcon = styled(Icon)`- color: var(--mb-color-bg-dark);+ color: var(--mb-color-background-tertiary-inverse);cursor: pointer;&:hover {diff --git a/frontend/src/metabase/admin/components/RelatedSettingsSection/RelatedSettingsSection.tsx b/frontend/src/metabase/admin/components/RelatedSettingsSection/RelatedSettingsSection.tsxindex 69628339794..74a195d888d 100644--- a/frontend/src/metabase/admin/components/RelatedSettingsSection/RelatedSettingsSection.tsx+++ b/frontend/src/metabase/admin/components/RelatedSettingsSection/RelatedSettingsSection.tsx@@ -61,7 +61,7 @@ const RelatedSettingCard = ({className={S.relatedSettingCard}><Group gap="sm" align="center" h="100%">- <Icon name={icon} color="var(--mb-color-brand)" />+ <Icon name={icon} c="brand" /><Text fw={500} ta="center">{name}diff --git a/frontend/src/metabase/admin/components/SettingsSection/SettingsSection.module.css b/frontend/src/metabase/admin/components/SettingsSection/SettingsSection.module.cssindex 42ee3e3edf0..0e82fe883bf 100644--- a/frontend/src/metabase/admin/components/SettingsSection/SettingsSection.module.css+++ b/frontend/src/metabase/admin/components/SettingsSection/SettingsSection.module.css@@ -1,5 +1,5 @@.SettingsSection {- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);border: 1px solid var(--mb-color-border);border-radius: var(--mantine-radius-md);padding: var(--mantine-spacing-xl);diff --git a/frontend/src/metabase/admin/components/SettingsSection/SettingsSection.tsx b/frontend/src/metabase/admin/components/SettingsSection/SettingsSection.tsxindex 17df689e181..548b8454596 100644--- a/frontend/src/metabase/admin/components/SettingsSection/SettingsSection.tsx+++ b/frontend/src/metabase/admin/components/SettingsSection/SettingsSection.tsx@@ -37,7 +37,7 @@ export function SettingsSection({{title}</Title>)}- {description && <Text c="text-medium">{description}</Text>}+ {description && <Text c="text-secondary">{description}</Text>}</Box>)}{children}@@ -63,7 +63,7 @@ export function SettingsPageWrapper({<Box>{title && <Title order={1}>{title}</Title>}{description && (- <Text c="text-medium" maw="40rem">+ <Text c="text-secondary" maw="40rem">{description}</Text>)}diff --git a/frontend/src/metabase/admin/databases/components/DatabaseConnectionHealthInfo.tsx b/frontend/src/metabase/admin/databases/components/DatabaseConnectionHealthInfo.tsxindex 18e13ca9824..2f54f80d7b1 100644--- a/frontend/src/metabase/admin/databases/components/DatabaseConnectionHealthInfo.tsx+++ b/frontend/src/metabase/admin/databases/components/DatabaseConnectionHealthInfo.tsx@@ -30,7 +30,7 @@ export const DatabaseConnectionHealthInfo = ({() =>({message: t`Loading...`,- color: "var(--mb-color-tooltip-text)",+ color: "tooltip-text",}) as const,).with(@@ -42,7 +42,7 @@ export const DatabaseConnectionHealthInfo = ({() =>({message: t`Failed to retrieve database health status.`,- color: "var(--mb-color-tooltip-text)",+ color: "tooltip-text",}) as const,).exhaustive();diff --git a/frontend/src/metabase/admin/databases/components/DatabaseConnectionInfoSection/DatabaseConnectionInfoSection.module.css b/frontend/src/metabase/admin/databases/components/DatabaseConnectionInfoSection/DatabaseConnectionInfoSection.module.cssindex 02777954d02..80579cb88f4 100644--- a/frontend/src/metabase/admin/databases/components/DatabaseConnectionInfoSection/DatabaseConnectionInfoSection.module.css+++ b/frontend/src/metabase/admin/databases/components/DatabaseConnectionInfoSection/DatabaseConnectionInfoSection.module.css@@ -1,3 +1,3 @@.actionButton[data-action-status="idle"] {- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);}diff --git a/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/DatabaseHelpSidePanel.tsx b/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/DatabaseHelpSidePanel.tsxindex f0eae1fcbcf..35e4aea9fbb 100644--- a/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/DatabaseHelpSidePanel.tsx+++ b/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/DatabaseHelpSidePanel.tsx@@ -56,7 +56,7 @@ export const DatabaseHelpSidePanel = ({ engineKey, onClose }: Props) => {display="flex"flex={{ sm: "1 0 20rem", md: "1 0 26.5rem", base: "1 0 100%" }}h="100%"- bg="var(--mb-color-bg-white)"+ bg="background-primary"><Box p="xl" w="100%"><Flex align="baseline" justify="space-between" mb="md">diff --git a/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/EmbeddedEngineDocContent/EmbeddedEngineDocContent.module.css b/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/EmbeddedEngineDocContent/EmbeddedEngineDocContent.module.cssindex 682a95bf04f..a9c18b41e94 100644--- a/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/EmbeddedEngineDocContent/EmbeddedEngineDocContent.module.css+++ b/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/EmbeddedEngineDocContent/EmbeddedEngineDocContent.module.css@@ -25,7 +25,7 @@}pre {- background-color: var(--mb-color-background-light);+ background-color: var(--mb-color-background-secondary);padding: 8px 10px;}@@ -34,7 +34,7 @@}blockquote {- background-color: var(--mb-color-bg-medium);+ background-color: var(--mb-color-background-tertiary);border-radius: 0.25rem;margin: 0.25rem 0 1.25rem;padding: 1rem 1.5rem;diff --git a/frontend/src/metabase/admin/databases/components/DatabaseInfoSection.tsx b/frontend/src/metabase/admin/databases/components/DatabaseInfoSection.tsxindex 95cda9d5f64..8e46b954671 100644--- a/frontend/src/metabase/admin/databases/components/DatabaseInfoSection.tsx+++ b/frontend/src/metabase/admin/databases/components/DatabaseInfoSection.tsx@@ -34,7 +34,7 @@ export const DatabaseInfoSection = ({<Box w="100%"><CardwithBorder- bg="bg-light"+ bg="background-secondary"shadow="none"style={{ flexGrow: 0 }}px="lg"diff --git a/frontend/src/metabase/admin/databases/components/ExistingDatabaseHeader/ExistingDatabaseHeader.tsx b/frontend/src/metabase/admin/databases/components/ExistingDatabaseHeader/ExistingDatabaseHeader.tsxindex f6355796e21..81cf39ce8b3 100644--- a/frontend/src/metabase/admin/databases/components/ExistingDatabaseHeader/ExistingDatabaseHeader.tsx+++ b/frontend/src/metabase/admin/databases/components/ExistingDatabaseHeader/ExistingDatabaseHeader.tsx@@ -31,11 +31,11 @@ export const ExistingDatabaseHeader = ({<Title order={2}>{database?.name}</Title><Flex gap="sm">{driverName && (- <Text size="sm" c="text-medium">+ <Text size="sm" c="text-secondary">{driverName}</Text>)}- <Text size="sm" c="text-medium">+ <Text size="sm" c="text-secondary">{c("Date on which the database was added to Metabase (e.g. Added 3/4/2025)",).t`Added ${new Intl.DateTimeFormat(undefined, {diff --git a/frontend/src/metabase/admin/databases/containers/DatabasePage.tsx b/frontend/src/metabase/admin/databases/containers/DatabasePage.tsxindex e967fa59a4a..47c3d506034 100644--- a/frontend/src/metabase/admin/databases/containers/DatabasePage.tsx+++ b/frontend/src/metabase/admin/databases/containers/DatabasePage.tsx@@ -65,7 +65,7 @@ export function DatabasePage({ params, route }: DatabasePageProps) {<Flexdirection="row"h="100%"- style={{ backgroundColor: "var(--mb-color-bg-light)" }}+ style={{ backgroundColor: "var(--mb-color-background-secondary)" }}><Box h="100%" w="100%" component={ScrollArea}><Boxdiff --git a/frontend/src/metabase/admin/datamodel/components/SegmentActionSelect.module.css b/frontend/src/metabase/admin/datamodel/components/SegmentActionSelect.module.cssindex 15df813679b..04d35b4713b 100644--- a/frontend/src/metabase/admin/datamodel/components/SegmentActionSelect.module.css+++ b/frontend/src/metabase/admin/datamodel/components/SegmentActionSelect.module.css@@ -5,5 +5,5 @@/* double classname for specifity */.dangerItem.dangerItem:hover {background-color: var(--mb-color-error);- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);}diff --git a/frontend/src/metabase/admin/datamodel/components/SegmentForm/SegmentForm.styled.tsx b/frontend/src/metabase/admin/datamodel/components/SegmentForm/SegmentForm.styled.tsxindex ad6b230255d..79d10d9a61a 100644--- a/frontend/src/metabase/admin/datamodel/components/SegmentForm/SegmentForm.styled.tsx+++ b/frontend/src/metabase/admin/datamodel/components/SegmentForm/SegmentForm.styled.tsx@@ -11,7 +11,7 @@ export const FormRoot = styled.form`width: 100%;height: 100%;overflow: auto;- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);`;export const FormSection = styled.div`diff --git a/frontend/src/metabase/admin/datamodel/components/SegmentItem.tsx b/frontend/src/metabase/admin/datamodel/components/SegmentItem.tsxindex 194b3d6fc3d..e4b305d30b2 100644--- a/frontend/src/metabase/admin/datamodel/components/SegmentItem.tsx+++ b/frontend/src/metabase/admin/datamodel/components/SegmentItem.tsx@@ -35,13 +35,8 @@ export const SegmentItem = ({ segment, onRetire }: Props) => {</Link>) : (<Group display="inline-flex" gap="sm" wrap="nowrap">- <Box- color="text-medium"- component={Icon}- flex="0 0 auto"- name="segment"- />- <Box c="text-dark" fw="bold">+ <Icon name="segment" c="text-secondary" flex="0 0 auto" />+ <Box c="text-primary" fw="bold">{segment.name}</Box></Group>diff --git a/frontend/src/metabase/admin/people/components/AddMemberRow.tsx b/frontend/src/metabase/admin/people/components/AddMemberRow.tsxindex 721bb33b3d4..d2539c490aa 100644--- a/frontend/src/metabase/admin/people/components/AddMemberRow.tsx+++ b/frontend/src/metabase/admin/people/components/AddMemberRow.tsx@@ -95,7 +95,7 @@ export function AddMemberRow({<Pillkey={user.id}size="xl"- bg="bg-medium"+ bg="background-tertiary"c="text-primary"ms={index > 0 ? "sm" : ""}withRemoveButtondiff --git a/frontend/src/metabase/admin/people/components/AddRow.tsx b/frontend/src/metabase/admin/people/components/AddRow.tsxindex c200540061e..4afbb908a97 100644--- a/frontend/src/metabase/admin/people/components/AddRow.tsx+++ b/frontend/src/metabase/admin/people/components/AddRow.tsx@@ -53,7 +53,7 @@ export const AddRow = ({</Button><Buttonvariant={isValid ? "filled" : "outline"}- bg={!isValid ? "transparent" : ""}+ bg={!isValid ? "transparent" : "none"}disabled={!isValid}onClick={onDone}>diff --git a/frontend/src/metabase/admin/people/components/GroupDetail.tsx b/frontend/src/metabase/admin/people/components/GroupDetail.tsxindex ca2dd567338..f5c0e252bb5 100644--- a/frontend/src/metabase/admin/people/components/GroupDetail.tsx+++ b/frontend/src/metabase/admin/people/components/GroupDetail.tsx@@ -120,7 +120,7 @@ export const GroupDetail = ({title={<Fragment>{getGroupNameLocalized(group ?? {})}- <Box component="span" c="text-light" ms="sm">+ <Box component="span" c="text-tertiary" ms="sm">{ngettext(msgid`${group.members.length} member`,`${group.members.length} members`,diff --git a/frontend/src/metabase/admin/people/components/GroupMembersTable/GroupMembersTable.tsx b/frontend/src/metabase/admin/people/components/GroupMembersTable/GroupMembersTable.tsxindex 920b877001f..8691e72ce99 100644--- a/frontend/src/metabase/admin/people/components/GroupMembersTable/GroupMembersTable.tsx+++ b/frontend/src/metabase/admin/people/components/GroupMembersTable/GroupMembersTable.tsx@@ -144,7 +144,7 @@ const UserMemberRow = ({{canRemove ? (<Box component="td" ta="right"><UnstyledButton onClick={() => onMembershipRemove(member)}>- <Icon name="close" c="text-light" size={16} />+ <Icon name="close" c="text-tertiary" size={16} /></UnstyledButton></Box>) : null}@@ -158,13 +158,13 @@ const ApiKeyMemberRow = ({ member }: { member: Member }) => (<Text fw="bold">{member.first_name}</Text></td><td>- <Text fw="bold" c="text-medium">{t`API Key`}</Text>+ <Text fw="bold" c="text-secondary">{t`API Key`}</Text></td><td>{/* api keys don't have real emails */}</td><Box component="td" ta="right"><Link to="/admin/settings/authentication/api-keys"><Tooltip label={t`API keys`} position="left">- <Icon name="link" c="text-light" size={16} />+ <Icon name="link" c="text-tertiary" size={16} /></Tooltip></Link></Box>diff --git a/frontend/src/metabase/admin/people/components/GroupsListing.tsx b/frontend/src/metabase/admin/people/components/GroupsListing.tsxindex 0c414d0ca8a..cc16769d2c4 100644--- a/frontend/src/metabase/admin/people/components/GroupsListing.tsx+++ b/frontend/src/metabase/admin/people/components/GroupsListing.tsx@@ -148,7 +148,7 @@ function ActionsPopover({<Menu shadow="md" width={200} position="bottom-end"><Menu.Target><UnstyledButton aria-label={`group-action-button`}>- <Icon c="text-light" name="ellipsis" />+ <Icon c="text-tertiary" name="ellipsis" /></UnstyledButton></Menu.Target><Menu.Dropdown>@@ -300,7 +300,7 @@ const ApiKeyCount = ({ apiKeys }: { apiKeys: ApiKey[] }) => {return null;}return (- <Box component="span" c="text-light">+ <Box component="span" c="text-tertiary">{apiKeys.length === 1? t` (includes 1 API key)`: t` (includes ${apiKeys.length} API keys)`}diff --git a/frontend/src/metabase/admin/people/components/MembershipSelect/MembershipSelect.module.css b/frontend/src/metabase/admin/people/components/MembershipSelect/MembershipSelect.module.cssindex f5ac90a7f66..356b70c7a7d 100644--- a/frontend/src/metabase/admin/people/components/MembershipSelect/MembershipSelect.module.css+++ b/frontend/src/metabase/admin/people/components/MembershipSelect/MembershipSelect.module.css@@ -3,16 +3,16 @@align-items: center;justify-content: space-between;padding: 0.5rem 1.5rem;- background-color: var(--mb-color-bg-white);- color: var(--mb-color-text-medium);+ background-color: var(--mb-color-background-primary);+ color: var(--mb-color-text-secondary);font-weight: bold;&:hover {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);background-color: var(--mb-color-filter);:global(.Icon) {- color: var(--mb-color-text-white) !important;+ color: var(--mb-color-text-primary-inverse) !important;}}}diff --git a/frontend/src/metabase/admin/people/components/MembershipSelect/MembershipSelect.tsx b/frontend/src/metabase/admin/people/components/MembershipSelect/MembershipSelect.tsxindex 3205d4f7b48..782a7723ae4 100644--- a/frontend/src/metabase/admin/people/components/MembershipSelect/MembershipSelect.tsx+++ b/frontend/src/metabase/admin/people/components/MembershipSelect/MembershipSelect.tsx@@ -144,7 +144,7 @@ export const MembershipSelect = ({groups={groups}selectedGroupIds={selectedGroupIds}/>- <Icon c="text-light" name="chevrondown" size={10} />+ <Icon c="text-tertiary" name="chevrondown" size={10} /></Flex></Popover.Target><Popover.Dropdown w="300px" mah="600px" py="sm">diff --git a/frontend/src/metabase/admin/people/components/PeopleList.tsx b/frontend/src/metabase/admin/people/components/PeopleList.tsxindex 5f16d2e962d..c0524a8a669 100644--- a/frontend/src/metabase/admin/people/components/PeopleList.tsx+++ b/frontend/src/metabase/admin/people/components/PeopleList.tsx@@ -257,7 +257,7 @@ export const PeopleList = ({><Box my="lg"><Icon name="search" mb="sm" size={32} />- <Text c="text-light" fz="lg" fw={700}>+ <Text c="text-tertiary" fz="lg" fw={700}>{noResultsMessage}</Text></Box>diff --git a/frontend/src/metabase/admin/people/components/PeopleListRow.tsx b/frontend/src/metabase/admin/people/components/PeopleListRow.tsxindex e6583479183..91ec13fc4da 100644--- a/frontend/src/metabase/admin/people/components/PeopleListRow.tsx+++ b/frontend/src/metabase/admin/people/components/PeopleListRow.tsx@@ -74,7 +74,7 @@ export const PeopleListRow = ({return (<tr key={user.id}>- <Flex component="td" align="center" gap="md" c="text-white">+ <Flex component="td" align="center" gap="md" c="text-primary-inverse"><UserAvatar bg={userToColor(user)} user={user} /><Text fw="700">{getFullName(user) ?? "-"}</Text></Flex>diff --git a/frontend/src/metabase/admin/people/components/ReactivateUserButton.module.css b/frontend/src/metabase/admin/people/components/ReactivateUserButton.module.cssindex 793bd0072dc..5138cfa1719 100644--- a/frontend/src/metabase/admin/people/components/ReactivateUserButton.module.css+++ b/frontend/src/metabase/admin/people/components/ReactivateUserButton.module.css@@ -1,5 +1,5 @@.refreshLink {- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);cursor: pointer;padding: 0.5rem;@@ -8,7 +8,7 @@}&.disabled:hover {- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);cursor: unset;}}diff --git a/frontend/src/metabase/admin/performance/components/PerformanceApp.module.css b/frontend/src/metabase/admin/performance/components/PerformanceApp.module.cssindex d7ad9d11fed..b2364ff362c 100644--- a/frontend/src/metabase/admin/performance/components/PerformanceApp.module.css+++ b/frontend/src/metabase/admin/performance/components/PerformanceApp.module.css@@ -1,6 +1,6 @@.TabsList {padding: 0 2.5rem;- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);border-bottom-width: 1px;margin-top: 1.5rem;border-bottom-color: var(--mb-color-border);@@ -33,7 +33,7 @@.TabBody {flex: 1;- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);height: 100%;}diff --git a/frontend/src/metabase/admin/performance/components/StrategyEditorForDatabases.styled.tsx b/frontend/src/metabase/admin/performance/components/StrategyEditorForDatabases.styled.tsxindex 7f8f0d1d7d2..cbb0a4582a2 100644--- a/frontend/src/metabase/admin/performance/components/StrategyEditorForDatabases.styled.tsx+++ b/frontend/src/metabase/admin/performance/components/StrategyEditorForDatabases.styled.tsx@@ -5,7 +5,7 @@ import styled from "@emotion/styled";export const Panel = styled.section<{ hasLeftBorder?: boolean }>`overflow-y: auto;- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);height: 100%;${(props) =>diff --git a/frontend/src/metabase/admin/performance/components/StrategyForm.styled.tsx b/frontend/src/metabase/admin/performance/components/StrategyForm.styled.tsxindex b46cf408d85..f837c1dc9c9 100644--- a/frontend/src/metabase/admin/performance/components/StrategyForm.styled.tsx+++ b/frontend/src/metabase/admin/performance/components/StrategyForm.styled.tsx@@ -30,7 +30,7 @@ export const StyledFormButtonsGroup = styled(Group)<{ isInSidebar?: boolean }>`padding-bottom: 0;`: `- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);border-top: 1px solid var(--mb-color-border);padding-inline: 2.5rem;`}diff --git a/frontend/src/metabase/admin/performance/components/StrategyForm.tsx b/frontend/src/metabase/admin/performance/components/StrategyForm.tsxindex 54841b76402..da64fe95ad7 100644--- a/frontend/src/metabase/admin/performance/components/StrategyForm.tsx+++ b/frontend/src/metabase/admin/performance/components/StrategyForm.tsx@@ -234,10 +234,10 @@ const StrategyFormBody = ({})}>{shouldShowName && (- <Box lh="1rem" pt="md" color="text-medium">+ <Box lh="1rem" pt="md" color="text-secondary"><Group gap="sm">{targetModel === "database" && (- <FixedSizeIcon name="database" color="inherit" />+ <FixedSizeIcon name="database" c="inherit" />)}<Text fw="bold" py="1rem">{targetName}@@ -481,10 +481,10 @@ const StrategySelector = ({<FormRadioGrouplabel={<Stack gap="xs">- <Text lh="1rem" color="text-medium" id={headingId}>+ <Text lh="1rem" color="text-secondary" id={headingId}>{t`Select the cache invalidation policy`}</Text>- <Text lh="1rem" fw="normal" size="sm" color="text-medium">+ <Text lh="1rem" fw="normal" size="sm" color="text-secondary">{t`This determines how long cached results will be stored.`}</Text></Stack>diff --git a/frontend/src/metabase/admin/performance/hooks/useInvalidateTarget.tsx b/frontend/src/metabase/admin/performance/hooks/useInvalidateTarget.tsxindex 345c3279d9f..4f383d6852b 100644--- a/frontend/src/metabase/admin/performance/hooks/useInvalidateTarget.tsx+++ b/frontend/src/metabase/admin/performance/hooks/useInvalidateTarget.tsx@@ -34,7 +34,7 @@ export const useInvalidateTarget = (icon: "warning",message: e.data.message,toastColor: "error",- dismissIconColor: "var(--mb-color-text-white)",+ dismissIconColor: "var(--mb-color-text-primary-inverse)",}),);}diff --git a/frontend/src/metabase/admin/permissions/components/PermissionHelpDescription/PermissionHelpDescription.styled.tsx b/frontend/src/metabase/admin/permissions/components/PermissionHelpDescription/PermissionHelpDescription.styled.tsxindex 558d93facd6..5a3f3291f92 100644--- a/frontend/src/metabase/admin/permissions/components/PermissionHelpDescription/PermissionHelpDescription.styled.tsx+++ b/frontend/src/metabase/admin/permissions/components/PermissionHelpDescription/PermissionHelpDescription.styled.tsx@@ -16,6 +16,6 @@ export const PermissionIconContainer = styled.div<PermissionIconContainerProps>`justify-content: center;border-radius: 0.25rem;margin-right: 0.375rem;- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);background-color: ${(props) => color(props.color)};`;diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorBreadcrumbs.styled.tsx b/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorBreadcrumbs.styled.tsxindex f713af7e0fe..841a0c338d2 100644--- a/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorBreadcrumbs.styled.tsx+++ b/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorBreadcrumbs.styled.tsx@@ -5,7 +5,7 @@ import { lighten } from "metabase/lib/colors";export const BreadcrumbsSeparator = styled.div`display: inline-block;- color: var(--mb-color-bg-dark);+ color: var(--mb-color-background-tertiary-inverse);position: relative;margin: 0 6px;top: 2px;diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorSplitPermsMessage.tsx b/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorSplitPermsMessage.tsxindex 7b0cc87a85d..9a27320ffbc 100644--- a/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorSplitPermsMessage.tsx+++ b/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorSplitPermsMessage.tsx@@ -31,7 +31,7 @@ export const PermissionsEditorSplitPermsMessage = () => {}}><Alert- icon={<Icon name="info" size={16} c="text-dark" />}+ icon={<Icon name="info" size={16} c="text-primary" />}variant="light"p="1rem"styles={{@@ -39,7 +39,7 @@ export const PermissionsEditorSplitPermsMessage = () => {backgroundColor: "var(--mb-color-brand-lighter)",},closeButton: {- color: "var(--mb-color-text-dark)",+ color: "var(--mb-color-text-primary)",},}}withCloseButtondiff --git a/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsPageLayout.styled.tsx b/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsPageLayout.styled.tsxindex 1e642f5a34c..f25a3c9f4de 100644--- a/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsPageLayout.styled.tsx+++ b/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsPageLayout.styled.tsx@@ -47,13 +47,13 @@ export const CloseSidebarButton = styled()`top: 1.75rem;right: 1.5rem;- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);position: absolute;cursor: pointer;transition: color 200ms;&:hover {- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);}`;diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelect.jsx b/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelect.jsxindex 11e1c7547f8..81b0490954d 100644--- a/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelect.jsx+++ b/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelect.jsx@@ -77,7 +77,7 @@ export const PermissionsSelect = memo(function PermissionsSelect({{...selectedOption}isHighlighted={isHighlighted}hint={disabledTooltip}- iconColor="text-light"+ iconColor="text-tertiary"/>) : (<SelectedOption {...selectedOption} />@@ -93,7 +93,7 @@ export const PermissionsSelect = memo(function PermissionsSelect({style={{ visibility: isDisabled ? "hidden" : "visible" }}name="chevrondown"size={16}- color={lighten("text-light", 0.15)}+ color={lighten("text-tertiary", 0.15)}/></PermissionsSelectRoot></Popover.Target>diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelect.styled.tsx b/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelect.styled.tsxindex 1567819dd27..b6aaaa93278 100644--- a/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelect.styled.tsx+++ b/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelect.styled.tsx@@ -33,7 +33,7 @@ export const OptionsListItem = styled.li`padding: 0.5rem 1rem;&:hover {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);background-color: ${() => lighten("accent7", 0.1)};}`;@@ -45,7 +45,7 @@ export const ActionsList = styled(OptionsList)`export const ToggleContainer = styled.div`display: flex;align-items: center;- background-color: var(--mb-color-bg-medium);+ background-color: var(--mb-color-background-tertiary);padding: 0.5rem 1rem;justify-content: flex-end;`;@@ -68,12 +68,12 @@ export const WarningIcon = styled(}),)`margin-right: 0.25rem;- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);`;export const DisabledPermissionOption = styled(PermissionsSelectOption)<{isHighlighted: boolean;}>`color: ${(props) =>- props.isHighlighted ? color("text-medium") : color("text-light")};+ props.isHighlighted ? color("text-secondary") : color("text-tertiary")};`;diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelectOption.styled.tsx b/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelectOption.styled.tsxindex 9e39d1069c0..cb685f1f8c3 100644--- a/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelectOption.styled.tsx+++ b/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelectOption.styled.tsx@@ -17,7 +17,7 @@ export const IconContainer = styled.div<{ color: ColorName }>`border-radius: 3px;width: 20px;height: 20px;- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);background-color: ${(props) => color(props.color)};flex-shrink: 0;`;diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsSidebar/PermissionsSidebar.styled.tsx b/frontend/src/metabase/admin/permissions/components/PermissionsSidebar/PermissionsSidebar.styled.tsxindex 1e24a58e4b9..f48a22ba7cf 100644--- a/frontend/src/metabase/admin/permissions/components/PermissionsSidebar/PermissionsSidebar.styled.tsx+++ b/frontend/src/metabase/admin/permissions/components/PermissionsSidebar/PermissionsSidebar.styled.tsx@@ -19,13 +19,13 @@ export const SidebarHeader = styled.div`export const BackIcon = styled(Icon)`margin-right: 0.5rem;- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);`;export const BackButton = styled.button`display: flex;align-items: center;- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);font-family: var(--mb-default-font-family);font-weight: 700;font-size: 14px;diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsSidebar/PermissionsSidebarContent.tsx b/frontend/src/metabase/admin/permissions/components/PermissionsSidebar/PermissionsSidebarContent.tsxindex 564a1b665d3..52ad0683bf4 100644--- a/frontend/src/metabase/admin/permissions/components/PermissionsSidebar/PermissionsSidebarContent.tsx+++ b/frontend/src/metabase/admin/permissions/components/PermissionsSidebar/PermissionsSidebarContent.tsx@@ -48,7 +48,7 @@ export const PermissionsSidebarContent = memo() : (<SidebarContentTitle>{title}</SidebarContentTitle>)}- {description && <Text color="text-dark">{description}</Text>}+ {description && <Text color="text-primary">{description}</Text>}{entityViewFocus && onEntityChange && (<EntityViewSwitchvalue={entityViewFocus}diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsTable/PermissionsTable.styled.tsx b/frontend/src/metabase/admin/permissions/components/PermissionsTable/PermissionsTable.styled.tsxindex b9c56c534f1..961080b0ac5 100644--- a/frontend/src/metabase/admin/permissions/components/PermissionsTable/PermissionsTable.styled.tsx+++ b/frontend/src/metabase/admin/permissions/components/PermissionsTable/PermissionsTable.styled.tsx@@ -17,9 +17,9 @@ const getTableBorder = (theme: Theme) =>const getHeaderBackground = (theme: Theme) =>`linear-gradient(to top,- color-mix(in srgb, ${theme.fn.themeColor("border")} 50%, ${theme.fn.themeColor("bg-white")} 50%) 1px,- var(--mb-color-bg-white) 1px,- var(--mb-color-bg-white) 100%+ color-mix(in srgb, ${theme.fn.themeColor("border")} 50%, ${theme.fn.themeColor("background-primary")} 50%) 1px,+ var(--mb-color-background-primary) 1px,+ var(--mb-color-background-primary) 100%)`;export const PermissionsTableRoot = styled.table`@@ -35,7 +35,7 @@ export const PermissionsTableCell = styled.td`box-sizing: border-box;min-height: 40px;overflow: hidden;- background: var(--mb-color-bg-white);+ background: var(--mb-color-background-primary);&:first-of-type {max-width: 300px;@@ -44,7 +44,7 @@ export const PermissionsTableCell = styled.td`position: sticky;padding-left: 0;padding-right: 1.5rem;- background: var(--mb-color-bg-white);+ background: var(--mb-color-background-primary);&:after {position: absolute;@@ -99,7 +99,7 @@ export const HintIcon = styled();}),)`- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);margin-left: 0.375rem;cursor: pointer;`;diff --git a/frontend/src/metabase/admin/permissions/components/ToolbarButton/ToolbarButton.styled.tsx b/frontend/src/metabase/admin/permissions/components/ToolbarButton/ToolbarButton.styled.tsxindex 5da60fe78ee..4ecb72dac02 100644--- a/frontend/src/metabase/admin/permissions/components/ToolbarButton/ToolbarButton.styled.tsx+++ b/frontend/src/metabase/admin/permissions/components/ToolbarButton/ToolbarButton.styled.tsx@@ -7,7 +7,7 @@ export const ToolbarButtonRoot = styled.button`display: flex;align-items: center;cursor: pointer;- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);padding: 0.25rem 0.75rem;font-weight: 700;transition: color 200ms;diff --git a/frontend/src/metabase/admin/settings/auth/components/AuthCard/AuthCard.styled.tsx b/frontend/src/metabase/admin/settings/auth/components/AuthCard/AuthCard.styled.tsxindex 168ca7debb3..ba1ea38489f 100644--- a/frontend/src/metabase/admin/settings/auth/components/AuthCard/AuthCard.styled.tsx+++ b/frontend/src/metabase/admin/settings/auth/components/AuthCard/AuthCard.styled.tsx@@ -17,13 +17,13 @@ export const CardHeader = styled.div``;export const CardTitle = styled.div`- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);font-size: 1.5rem;font-weight: bold;`;export const CardDescription = styled.div`- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);font-size: 0.875rem;line-height: 1.5rem;margin-bottom: 1rem;@@ -39,7 +39,7 @@ export const CardBadge = styled.div<CardBadgeProps>`background-color: ${(props) =>props.isEnabled? "var(--mb-color-brand-lighter)"- : "var(--mb-color-bg-light)"};+ : "var(--mb-color-background-secondary)"};padding: 0.25rem 0.375rem;border-radius: 0.25rem;font-weight: bold;diff --git a/frontend/src/metabase/admin/settings/auth/components/GoogleAuthForm/GoogleAuthForm.tsx b/frontend/src/metabase/admin/settings/auth/components/GoogleAuthForm/GoogleAuthForm.tsxindex 42899d958d3..6b489fa4eed 100644--- a/frontend/src/metabase/admin/settings/auth/components/GoogleAuthForm/GoogleAuthForm.tsx+++ b/frontend/src/metabase/admin/settings/auth/components/GoogleAuthForm/GoogleAuthForm.tsx@@ -82,10 +82,10 @@ export const GoogleAuthForm = (): JSX.Element => {<Form disabled={!dirty}><Stack gap="md"><Title order={2}>{t`Sign in with Google`}</Title>- <Text c="text-medium">+ <Text c="text-secondary">{t`Allows users with existing Metabase accounts to login with a Google account that matches their email address in addition to their Metabase username and password.`}</Text>- <Text c="text-medium">+ <Text c="text-secondary">{jt`To allow users to sign in with Google you'll need to give Metabase a Google Developers console application client ID. It only takes a few steps and instructions on how to create a key can be found ${(<ExternalLink key="link" href={docsUrl}>{t`here`}diff --git a/frontend/src/metabase/admin/settings/components/ApiKeys/EditApiKeyModal.tsx b/frontend/src/metabase/admin/settings/components/ApiKeys/EditApiKeyModal.tsxindex b0d309b6c80..b68a146397a 100644--- a/frontend/src/metabase/admin/settings/components/ApiKeys/EditApiKeyModal.tsx+++ b/frontend/src/metabase/admin/settings/components/ApiKeys/EditApiKeyModal.tsx@@ -54,7 +54,7 @@ const RegenerateKeyModal = ({<Textcomponent="label"fw="bold"- color="text-light"+ color="text-tertiary"size="sm">{t`Key name`}</Text><Text fw="bold" size="sm">@@ -65,7 +65,7 @@ const RegenerateKeyModal = ({<Textcomponent="label"fw="bold"- color="text-light"+ color="text-tertiary"size="sm">{t`Group`}</Text><Text fw="bold" size="sm">diff --git a/frontend/src/metabase/admin/settings/components/ApiKeys/ManageApiKeys.tsx b/frontend/src/metabase/admin/settings/components/ApiKeys/ManageApiKeys.tsxindex bc25641b581..9c77f8fe0df 100644--- a/frontend/src/metabase/admin/settings/components/ApiKeys/ManageApiKeys.tsx+++ b/frontend/src/metabase/admin/settings/components/ApiKeys/ManageApiKeys.tsx@@ -166,7 +166,7 @@ export const ManageApiKeys = () => {align="center"data-testid="api-keys-settings-header">- <Text c="text-medium">+ <Text c="text-secondary">{t`Allow users to use API keys to authenticate their API calls.`}</Text><Buttondiff --git a/frontend/src/metabase/admin/settings/components/ApiKeys/SecretKeyModal.tsx b/frontend/src/metabase/admin/settings/components/ApiKeys/SecretKeyModal.tsxindex fd1b3511c34..be7c99a406c 100644--- a/frontend/src/metabase/admin/settings/components/ApiKeys/SecretKeyModal.tsx+++ b/frontend/src/metabase/admin/settings/components/ApiKeys/SecretKeyModal.tsx@@ -45,7 +45,7 @@ export const SecretKeyModal = ({/><Textsize="sm"- color="text-medium"+ color="text-secondary">{t`Please copy this key and save it somewhere safe. For security reasons, we can't show it to you again.`}</Text></Flex><Group justify="flex-end">diff --git a/frontend/src/metabase/admin/settings/components/CloudPanel/CloudPanel.styled.tsx b/frontend/src/metabase/admin/settings/components/CloudPanel/CloudPanel.styled.tsxindex 1b854760e57..5ace13bd228 100644--- a/frontend/src/metabase/admin/settings/components/CloudPanel/CloudPanel.styled.tsx+++ b/frontend/src/metabase/admin/settings/components/CloudPanel/CloudPanel.styled.tsx@@ -7,7 +7,7 @@ export const MigrationCard = styled.div`border: 1px solid var(--mb-color-border);border-radius: 0.5rem;padding: 2rem 3rem;- background: var(--mb-color-bg-white);+ background: var(--mb-color-background-primary);`;export const LargeIconContainer = styled.div<{diff --git a/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationInProgress.tsx b/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationInProgress.tsxindex 9e5423c7379..b3677f1ae55 100644--- a/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationInProgress.tsx+++ b/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationInProgress.tsx@@ -89,7 +89,7 @@ export const MigrationInProgress = ({)}<Box mt="lg" mb="md">- <Text size="md" c="text-medium">+ <Text size="md" c="text-secondary">{progressMessage[migration.state]}</Text><Progress value={migration.progress} mt=".25rem" />diff --git a/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationStart.tsx b/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationStart.tsxindex e92666ad128..50a3b26357b 100644--- a/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationStart.tsx+++ b/frontend/src/metabase/admin/settings/components/CloudPanel/MigrationStart.tsx@@ -35,7 +35,7 @@ export const MigrationStart = ({}}><Box mt="md" pb="4rem" px="6rem" ta="center">- <Icon name="cloud_filled" size="3rem" color="brand" />+ <Icon name="cloud_filled" size="3rem" c="brand" /><Modal.Title mt="1.5rem">{t`Get started with Metabase Cloud`}</Modal.Title><Text mt="1.5rem">diff --git a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSecuritySettings/CorsInputWidget.tsx b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSecuritySettings/CorsInputWidget.tsxindex 287ac72b22d..01f9e970232 100644--- a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSecuritySettings/CorsInputWidget.tsx+++ b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSecuritySettings/CorsInputWidget.tsx@@ -24,13 +24,13 @@ export const CorsInputWidget = () => {title={t`Cross-Origin Resource Sharing (CORS)`}description={<Group align="center" gap="sm">- <Text c="text-medium" fz="md">+ <Text c="text-secondary" fz="md">{jt`Add the website domains where you want to allow modular embedding (with or without SDK). API keys can only be used on localhost. ${(<HoverCard key="embedding-cors-hint" position="bottom"><HoverCard.Target><Iconname="info"- c="text-medium"+ c="text-secondary"cursor="pointer"ml="sm"style={{ verticalAlign: "middle" }}@@ -39,7 +39,7 @@ export const CorsInputWidget = () => {<HoverCard.Dropdown><Box p="md" w={270}>- <Text lh="lg" c="text-medium">+ <Text lh="lg" c="text-secondary">{corsHintText}</Text></Box>diff --git a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSettings.module.css b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSettings.module.cssindex 5a67e2b66b1..19d52f37966 100644--- a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSettings.module.css+++ b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSettings.module.css@@ -1,7 +1,7 @@.SectionCard {border-radius: 8px;border: 1px solid var(--mb-color-border);- background: var(--mb-color-background);+ background: var(--mb-color-background-primary);}.CardLinksSection {diff --git a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSettingsCard.tsx b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSettingsCard.tsxindex 6e9f3a4df49..a4001673046 100644--- a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSettingsCard.tsx+++ b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSettingsCard.tsx@@ -46,11 +46,11 @@ export function EmbeddingSettingsCard({return (<Flex direction="column" className={S.SectionCard} data-testid={testId}><Stack gap="xs" px="xl" py="lg">- <Text fw={600} c="text-dark" fz="h4">+ <Text fw={600} c="text-primary" fz="h4">{title}</Text>- <Text c="var(--mb-color-text-secondary)" lh="lg" mb="md" maw="38rem">+ <Text c="text-secondary" lh="lg" mb="md" maw="38rem">{description}</Text>@@ -69,16 +69,12 @@ export function EmbeddingSettingsCard({<Alertdata-testid="sdk-settings-alert-info"mt="md"- bg="bg-light"+ bg="background-secondary"bd="1px solid var(--mb-color-border)"><Flex gap="sm"><Box>- <Icon- color="var(--mb-color-text-secondary)"- name="info"- mt="2px"- />+ <Icon c="text-secondary" name="info" mt="2px" /></Box><Text c="text-primary" lh="lg">diff --git a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingToggle/EmbeddingToggle.tsx b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingToggle/EmbeddingToggle.tsxindex b84ac4cd7b3..c593277aa24 100644--- a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingToggle/EmbeddingToggle.tsx+++ b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingToggle/EmbeddingToggle.tsx@@ -38,9 +38,7 @@ export function EmbeddingToggle({] = useDisclosure(false);if (settingDetails?.is_env_setting) {- return (- <Text c="var(--mb-color-text-secondary)">{t`Set via environment variable`}</Text>- );+ return <Text c="text-secondary">{t`Set via environment variable`}</Text>;}const isEnabled =diff --git a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/SharedCombinedEmbeddingSettings/SharedCombinedEmbeddingSettings.tsx b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/SharedCombinedEmbeddingSettings/SharedCombinedEmbeddingSettings.tsxindex 3e855bf11f6..0f0dbb97b30 100644--- a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/SharedCombinedEmbeddingSettings/SharedCombinedEmbeddingSettings.tsx+++ b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/SharedCombinedEmbeddingSettings/SharedCombinedEmbeddingSettings.tsx@@ -65,7 +65,7 @@ export function SharedCombinedEmbeddingSettings({buttonLink={upgradeUrl}dismissible>- <Text c="text-medium" lh="md">+ <Text c="text-secondary" lh="md">{t`Embed charts, dashboards with drill-throughs, or even the query builder into your own application using customizable components. Secure your embeds with single sign-on.`}</Text></UpsellBanner>diff --git a/frontend/src/metabase/admin/settings/components/SettingHeader/SettingHeader.tsx b/frontend/src/metabase/admin/settings/components/SettingHeader/SettingHeader.tsxindex f913a16aab7..5ab3b3e4f41 100644--- a/frontend/src/metabase/admin/settings/components/SettingHeader/SettingHeader.tsx+++ b/frontend/src/metabase/admin/settings/components/SettingHeader/SettingHeader.tsx@@ -20,7 +20,7 @@ export const SettingHeader = ({{title}</SettingTitle>{!!description && (- <Text mb="sm" maw="38rem" lh="xl" c="text-medium">+ <Text mb="sm" maw="38rem" lh="xl" c="text-secondary">{description}</Text>)}@@ -38,7 +38,7 @@ export const SettingTitle = ({<TexthtmlFor={id}component="label"- c="text-dark"+ c="text-primary"fw="bold"display="inline-block"{...props}diff --git a/frontend/src/metabase/admin/settings/components/widgets/CustomGeoJSONWidget.tsx b/frontend/src/metabase/admin/settings/components/widgets/CustomGeoJSONWidget.tsxindex 9dd37b5285a..fe17f478bdc 100644--- a/frontend/src/metabase/admin/settings/components/widgets/CustomGeoJSONWidget.tsx+++ b/frontend/src/metabase/admin/settings/components/widgets/CustomGeoJSONWidget.tsx@@ -136,7 +136,7 @@ export const CustomGeoJSONWidget = () => {{!hasCustomMaps && (<Stack p="xl" align="center" gap="md"><Image w={120} h={120} src={noResultsSource} />- <Text fw="700" c="text-light">{t`No custom maps yet`}</Text>+ <Text fw="700" c="text-tertiary">{t`No custom maps yet`}</Text></Stack>)}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.tsxindex 2b300344076..4d4a44007d4 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@@ -19,7 +19,7 @@ export const GroupMappingsWidgetRoot = styled.div``;export const GroupMappingsWidgetHeader = styled.div`- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);border-top-left-radius: 8px;border-top-right-radius: 8px;display: flex;@@ -37,7 +37,7 @@ export const GroupMappingsWidgetToggleRoot = styled.div`display: flex;> * {- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);padding-right: var(--mantine-spacing-sm);padding-top: 0;}@@ -45,7 +45,7 @@ export const GroupMappingsWidgetToggleRoot = styled.div`export const GroupMappingsWidgetAbout = styled.div`align-items: center;- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);display: flex;flex-direction: row;diff --git a/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/MappingRow/MappingRow.styled.tsx b/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/MappingRow/MappingRow.styled.tsxindex ed267e1b0aa..fe6b3839e0f 100644--- a/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/MappingRow/MappingRow.styled.tsx+++ b/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/MappingRow/MappingRow.styled.tsx@@ -4,7 +4,7 @@ import styled from "@emotion/styled";import IconButtonWrapper from "metabase/common/components/IconButtonWrapper";export const DeleteMappingButton = styled(IconButtonWrapper)`- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);&:hover {color: var(--mb-color-danger);diff --git a/frontend/src/metabase/admin/settings/components/widgets/Notifications/WebhookForm.tsx b/frontend/src/metabase/admin/settings/components/widgets/Notifications/WebhookForm.tsxindex 137ae0f6200..e6ab8f3d4d1 100644--- a/frontend/src/metabase/admin/settings/components/widgets/Notifications/WebhookForm.tsx+++ b/frontend/src/metabase/admin/settings/components/widgets/Notifications/WebhookForm.tsx@@ -227,7 +227,7 @@ export const WebhookForm = ({<Alertvariant="light"mb="1.5rem"- style={{ backgroundColor: "var(--mb-color-bg-light)" }}+ style={{ backgroundColor: "var(--mb-color-background-secondary)" }}px="1.5rem"py="1rem"radius="0.5rem"@@ -264,7 +264,7 @@ export const WebhookForm = ({<Boxpy="0.5rem"px="1.5rem"- bg="bg-light"+ bg="background-secondary"style={{ borderRadius: "0.5rem" }}data-testid="notification-test-response">@@ -335,7 +335,7 @@ export const WebhookForm = ({{onDelete && (<Buttonvariant="subtle"- c="text-medium"+ c="text-secondary"size="compact-md"pl="0"leftSection={<Icon name="trash" />}diff --git a/frontend/src/metabase/admin/settings/components/widgets/PublicLinksListing/PublicLinksListing.tsx b/frontend/src/metabase/admin/settings/components/widgets/PublicLinksListing/PublicLinksListing.tsxindex f9e78824124..9559a41405e 100644--- a/frontend/src/metabase/admin/settings/components/widgets/PublicLinksListing/PublicLinksListing.tsx+++ b/frontend/src/metabase/admin/settings/components/widgets/PublicLinksListing/PublicLinksListing.tsx@@ -38,7 +38,7 @@ export const PublicLinksListing = <if (data.length === 0) {return (<Box- bg="bg-light"+ bg="background-secondary"bd="1px solid var(--mb-color-border)"bdrs="xs"px="md"diff --git a/frontend/src/metabase/admin/settings/components/widgets/VersionUpdateNotice/VersionUpdateNotice.module.css b/frontend/src/metabase/admin/settings/components/widgets/VersionUpdateNotice/VersionUpdateNotice.module.cssindex 3a1496631e8..790d246e70f 100644--- a/frontend/src/metabase/admin/settings/components/widgets/VersionUpdateNotice/VersionUpdateNotice.module.css+++ b/frontend/src/metabase/admin/settings/components/widgets/VersionUpdateNotice/VersionUpdateNotice.module.css@@ -4,7 +4,7 @@.message {padding: 1rem;- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);font-weight: bold;border: 1px solid var(--mb-color-brand);border-radius: 0.5rem;diff --git a/frontend/src/metabase/admin/settings/slack/SlackSetup.tsx b/frontend/src/metabase/admin/settings/slack/SlackSetup.tsxindex 349553eeed5..d18c0db646f 100644--- a/frontend/src/metabase/admin/settings/slack/SlackSetup.tsx+++ b/frontend/src/metabase/admin/settings/slack/SlackSetup.tsx@@ -58,7 +58,7 @@ const SetupHeader = ({</Markdown></Text>) : (- <Text c="text-medium">+ <Text c="text-secondary">{t`Bring the power of Metabase to your Slack #channels.`}{" "}{t`Follow these steps to connect to Slack:`}</Text>diff --git a/frontend/src/metabase/admin/tools/components/Help/help.module.css b/frontend/src/metabase/admin/tools/components/Help/help.module.cssindex 2ee6c9f415a..c4bbf731bac 100644--- a/frontend/src/metabase/admin/tools/components/Help/help.module.css+++ b/frontend/src/metabase/admin/tools/components/Help/help.module.css@@ -17,7 +17,7 @@border-radius: 0.5rem;transition: border 0.3s linear;text-decoration: none;- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);&:hover {border-color: var(--mb-color-brand);diff --git a/frontend/src/metabase/admin/tools/components/Logs/Logs.styled.tsx b/frontend/src/metabase/admin/tools/components/Logs/Logs.styled.tsxindex 8939afa159e..c2e313c47d5 100644--- a/frontend/src/metabase/admin/tools/components/Logs/Logs.styled.tsx+++ b/frontend/src/metabase/admin/tools/components/Logs/Logs.styled.tsx@@ -12,7 +12,7 @@ export const LogsContainer = styled(LoadingAndErrorWrapper)`export const LogsContent = styled.div`border: 1px solid var(--mb-color-border);border-radius: 0.5rem;- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);font-family: "Lucida Console", Monaco, monospace;font-size: 14px;white-space: pre;diff --git a/frontend/src/metabase/admin/tools/components/Logs/Logs.tsx b/frontend/src/metabase/admin/tools/components/Logs/Logs.tsxindex a7d94a441c2..227fb8adb23 100644--- a/frontend/src/metabase/admin/tools/components/Logs/Logs.tsx+++ b/frontend/src/metabase/admin/tools/components/Logs/Logs.tsx@@ -85,7 +85,7 @@ const LogsBase = ({query.length > 0 ? (<Buttonaria-label={t`Clear`}- c="text-dark"+ c="text-primary"leftSection={<Icon name="close" />}size="xs"variant="subtle"diff --git a/frontend/src/metabase/admin/tools/components/ModelCacheRefreshJobs/ModelCacheRefreshJobs.styled.tsx b/frontend/src/metabase/admin/tools/components/ModelCacheRefreshJobs/ModelCacheRefreshJobs.styled.tsxindex d4f8ff2a090..fe37121229d 100644--- a/frontend/src/metabase/admin/tools/components/ModelCacheRefreshJobs/ModelCacheRefreshJobs.styled.tsx+++ b/frontend/src/metabase/admin/tools/components/ModelCacheRefreshJobs/ModelCacheRefreshJobs.styled.tsx@@ -4,8 +4,8 @@ import styled from "@emotion/styled";export const ErrorBox = styled.div`padding: 0.5rem 1rem;border-radius: 4px;- color: var(--mb-color-text-dark);- background-color: var(--mb-color-bg-light);+ color: var(--mb-color-text-primary);+ background-color: var(--mb-color-background-secondary);font-family: Monaco, monospace;font-weight: 400;font-size: 12px;@@ -16,12 +16,12 @@ export const IconButtonContainer = styled.button`cursor: pointer;.Icon {- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);}&:hover {.Icon {- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);}}`;diff --git a/frontend/src/metabase/admin/tools/components/TasksApp/TasksTable.tsx b/frontend/src/metabase/admin/tools/components/TasksApp/TasksTable.tsxindex 374238d6194..aa0cb710b4c 100644--- a/frontend/src/metabase/admin/tools/components/TasksApp/TasksTable.tsx+++ b/frontend/src/metabase/admin/tools/components/TasksApp/TasksTable.tsx@@ -86,7 +86,10 @@ export const TasksTable = ({{tasks.length === 0 && (<tr><td colSpan={8}>- <Flex c="text-light" justify="center">{t`No results`}</Flex>+ <Flex+ c="text-tertiary"+ justify="center"+ >{t`No results`}</Flex></td></tr>)}diff --git a/frontend/src/metabase/admin/upsells/UpsellDevInstances.tsx b/frontend/src/metabase/admin/upsells/UpsellDevInstances.tsxindex 8bef402027e..4ce2d2bdc73 100644--- a/frontend/src/metabase/admin/upsells/UpsellDevInstances.tsx+++ b/frontend/src/metabase/admin/upsells/UpsellDevInstances.tsx@@ -25,7 +25,7 @@ export function UpsellDevInstances({ location }: { location: LOCATION }) {location={location}dismissible>- <Text c="text-medium" lh="md">+ <Text c="text-secondary" lh="md">{t`Test out code in staging in a separate Metabase instance before deploying to production.`}</Text></UpsellBanner>diff --git a/frontend/src/metabase/admin/upsells/components/UpsellBanner.tsx b/frontend/src/metabase/admin/upsells/components/UpsellBanner.tsxindex a6320a7145d..cff0551edf2 100644--- a/frontend/src/metabase/admin/upsells/components/UpsellBanner.tsx+++ b/frontend/src/metabase/admin/upsells/components/UpsellBanner.tsx@@ -82,7 +82,7 @@ export const _UpsellBanner: React.FC<UpsellBannerProps> = ({<BoxclassName={cx(S.UpsellBannerComponent, large && S.Large)}data-testid="upsell-banner"- bg="bg-white"+ bg="background-primary"{...domProps}><Flex align="flex-start" gap="sm" wrap="nowrap">diff --git a/frontend/src/metabase/admin/upsells/components/UpsellBigCard.tsx b/frontend/src/metabase/admin/upsells/components/UpsellBigCard.tsxindex 55e6ecef543..03eb0ef0430 100644--- a/frontend/src/metabase/admin/upsells/components/UpsellBigCard.tsx+++ b/frontend/src/metabase/admin/upsells/components/UpsellBigCard.tsx@@ -66,7 +66,7 @@ export const _UpsellBigCard: React.FC<UpsellBigCardProps> = ({<Boxdata-testid="upsell-big-card"className={S.UpsellBigCardComponent}- bg="bg-white"+ bg="background-primary"{...props}><Flex px="xl" py="md">diff --git a/frontend/src/metabase/admin/upsells/components/UpsellPill.module.css b/frontend/src/metabase/admin/upsells/components/UpsellPill.module.cssindex 6cfc3f826ff..b1cc758eb58 100644--- a/frontend/src/metabase/admin/upsells/components/UpsellPill.module.css+++ b/frontend/src/metabase/admin/upsells/components/UpsellPill.module.css@@ -17,7 +17,7 @@&:hover {background-color: var(--mb-color-upsell-primary);- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);border: 1px solid var(--mb-color-upsell-primary);}}diff --git a/frontend/src/metabase/archive/components/ArchivedEntityBanner/ArchivedEntityBanner.module.css b/frontend/src/metabase/archive/components/ArchivedEntityBanner/ArchivedEntityBanner.module.cssindex 3710dbe1085..8e0d57ccbce 100644--- a/frontend/src/metabase/archive/components/ArchivedEntityBanner/ArchivedEntityBanner.module.css+++ b/frontend/src/metabase/archive/components/ArchivedEntityBanner/ArchivedEntityBanner.module.css@@ -1,4 +1,4 @@.iconStyle {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);flex-shrink: 0;}diff --git a/frontend/src/metabase/archive/components/ArchivedEntityBanner/ArchivedEntityBanner.tsx b/frontend/src/metabase/archive/components/ArchivedEntityBanner/ArchivedEntityBanner.tsxindex 3035f7be619..648263cee98 100644--- a/frontend/src/metabase/archive/components/ArchivedEntityBanner/ArchivedEntityBanner.tsx+++ b/frontend/src/metabase/archive/components/ArchivedEntityBanner/ArchivedEntityBanner.tsx@@ -53,7 +53,7 @@ export const ArchivedEntityBanner = ({><Icon className={Styles.iconStyle} name="trash_filled" /></Box>- <Text color="text-white" size="md" lh="1rem">+ <Text color="text-primary-inverse" size="md" lh="1rem">{c("{0} is the entity in the trash, e.g. collection, dashboard, etc.",).t`This ${entityType} is in the trash.`}diff --git a/frontend/src/metabase/archive/components/ArchivedEntityBanner/BannerButton.tsx b/frontend/src/metabase/archive/components/ArchivedEntityBanner/BannerButton.tsxindex 08eb52f5393..d6d93069463 100644--- a/frontend/src/metabase/archive/components/ArchivedEntityBanner/BannerButton.tsx+++ b/frontend/src/metabase/archive/components/ArchivedEntityBanner/BannerButton.tsx@@ -15,14 +15,17 @@ export const BannerButton = ({<Buttonsize="compact-md"variant="outline"- color="text-white"+ color="text-primary-inverse"miw="2rem"h="2rem"onClick={onClick}><Flex align="center" gap="sm"><FixedSizeIcon size={12} name={iconName} />- <Text color="text-white" display={{ base: "none", sm: "inline" }}>+ <Text+ color="text-primary-inverse"+ display={{ base: "none", sm: "inline" }}+ >{children}</Text></Flex>diff --git a/frontend/src/metabase/auth/components/AuthButton/AuthButton.styled.tsx b/frontend/src/metabase/auth/components/AuthButton/AuthButton.styled.tsxindex 3f5e48e5b43..32c7fc6dce9 100644--- a/frontend/src/metabase/auth/components/AuthButton/AuthButton.styled.tsx+++ b/frontend/src/metabase/auth/components/AuthButton/AuthButton.styled.tsx@@ -5,7 +5,7 @@ import Link from "metabase/common/components/Link";export const TextLink = styled(Link)`cursor: pointer;- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);&:hover {color: var(--mb-color-brand);@@ -17,7 +17,7 @@ export const CardLink = styled(TextLink)`justify-content: center;align-items: center;padding: 1.25rem;- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);box-shadow: 0 3px 10px var(--mb-color-shadow);border-radius: 6px;`;diff --git a/frontend/src/metabase/auth/components/AuthLayout/AuthLayout.styled.tsx b/frontend/src/metabase/auth/components/AuthLayout/AuthLayout.styled.tsxindex e1a28daa2dc..015f0a9da4c 100644--- a/frontend/src/metabase/auth/components/AuthLayout/AuthLayout.styled.tsx+++ b/frontend/src/metabase/auth/components/AuthLayout/AuthLayout.styled.tsx@@ -6,7 +6,7 @@ import { breakpointMinSmall } from "metabase/styled-components/theme";export const LayoutRoot = styled.div`position: relative;min-height: 100vh;- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);`;export const LayoutBody = styled.div`@@ -23,7 +23,7 @@ export const LayoutCard = styled.div`width: 100%;margin-top: 1.5rem;padding: 2.5rem 1.5rem;- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);box-shadow: 0 1px 15px var(--mb-color-shadow);border-radius: 6px;diff --git a/frontend/src/metabase/auth/components/ForgotPassword/ForgotPassword.styled.tsx b/frontend/src/metabase/auth/components/ForgotPassword/ForgotPassword.styled.tsxindex 4af0a2c832b..8ff3ecc4e72 100644--- a/frontend/src/metabase/auth/components/ForgotPassword/ForgotPassword.styled.tsx+++ b/frontend/src/metabase/auth/components/ForgotPassword/ForgotPassword.styled.tsx@@ -25,13 +25,13 @@ export const InfoIconContainer = styled.div``;export const InfoMessage = styled.div`- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);text-align: center;margin-bottom: 1rem;`;export const InfoLink = styled(Link)`- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);margin-top: 2.5rem;&:hover {diff --git a/frontend/src/metabase/auth/components/ForgotPasswordForm/ForgotPasswordForm.styled.tsx b/frontend/src/metabase/auth/components/ForgotPasswordForm/ForgotPasswordForm.styled.tsxindex 8b23f873c1f..1199701938a 100644--- a/frontend/src/metabase/auth/components/ForgotPasswordForm/ForgotPasswordForm.styled.tsx+++ b/frontend/src/metabase/auth/components/ForgotPasswordForm/ForgotPasswordForm.styled.tsx@@ -4,7 +4,7 @@ import styled from "@emotion/styled";import Link from "metabase/common/components/Link/Link";export const PasswordFormTitle = styled.div`- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);font-size: 1.25rem;font-weight: 700;line-height: 1.5rem;@@ -20,7 +20,7 @@ export const PasswordFormFooter = styled.div``;export const PasswordFormLink = styled(Link)`- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);&:hover {color: var(--mb-color-brand);diff --git a/frontend/src/metabase/auth/components/GoogleButton/GoogleButton.module.css b/frontend/src/metabase/auth/components/GoogleButton/GoogleButton.module.cssindex 65115e76d3f..53c7e3b726d 100644--- a/frontend/src/metabase/auth/components/GoogleButton/GoogleButton.module.css+++ b/frontend/src/metabase/auth/components/GoogleButton/GoogleButton.module.css@@ -1,6 +1,6 @@.Link {cursor: pointer;- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);&:hover {color: var(--mb-color-brand);diff --git a/frontend/src/metabase/auth/components/Login/Login.tsx b/frontend/src/metabase/auth/components/Login/Login.tsxindex 3ecebceebfc..c95823ebbba 100644--- a/frontend/src/metabase/auth/components/Login/Login.tsx+++ b/frontend/src/metabase/auth/components/Login/Login.tsx@@ -40,7 +40,7 @@ export const Login = ({ params, location }: LoginProps): JSX.Element => {<AuthLayout><Boxrole="heading"- c="text-dark"+ c="text-primary"fz="1.25rem"fw="bold"lh="1.5rem"diff --git a/frontend/src/metabase/auth/components/ResetPassword/ResetPassword.styled.tsx b/frontend/src/metabase/auth/components/ResetPassword/ResetPassword.styled.tsxindex 9370ea4d582..954c806422f 100644--- a/frontend/src/metabase/auth/components/ResetPassword/ResetPassword.styled.tsx+++ b/frontend/src/metabase/auth/components/ResetPassword/ResetPassword.styled.tsx@@ -8,7 +8,7 @@ export const InfoBody = styled.div``;export const InfoTitle = styled.div`- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);font-size: 1.25rem;font-weight: 700;line-height: 1.5rem;@@ -17,7 +17,7 @@ export const InfoTitle = styled.div``;export const InfoMessage = styled.div`- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);text-align: center;margin-bottom: 2.5rem;`;diff --git a/frontend/src/metabase/auth/components/ResetPasswordForm/ResetPasswordForm.styled.tsx b/frontend/src/metabase/auth/components/ResetPasswordForm/ResetPasswordForm.styled.tsxindex 1d9ea946ef5..7cb201049d1 100644--- a/frontend/src/metabase/auth/components/ResetPasswordForm/ResetPasswordForm.styled.tsx+++ b/frontend/src/metabase/auth/components/ResetPasswordForm/ResetPasswordForm.styled.tsx@@ -2,7 +2,7 @@import styled from "@emotion/styled";export const PasswordFormTitle = styled.div`- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);font-size: 1.25rem;font-weight: 700;line-height: 1.5rem;@@ -11,7 +11,7 @@ export const PasswordFormTitle = styled.div``;export const PasswordFormMessage = styled.div`- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);text-align: center;margin-bottom: 1.5rem;`;diff --git a/frontend/src/metabase/browse/components/BrowseContainer.styled.tsx b/frontend/src/metabase/browse/components/BrowseContainer.styled.tsxindex 40a3bb641c5..fb33e9c6c6e 100644--- a/frontend/src/metabase/browse/components/BrowseContainer.styled.tsx+++ b/frontend/src/metabase/browse/components/BrowseContainer.styled.tsx@@ -11,7 +11,7 @@ export const BrowseContainer = styled.div`padding-top: 1rem;container-name: ItemsTableContainer;container-type: inline-size;- background-color: var(--mb-color-background-light);+ background-color: var(--mb-color-background-secondary);min-height: 100%;`;diff --git a/frontend/src/metabase/browse/components/BrowseDataHeader.tsx b/frontend/src/metabase/browse/components/BrowseDataHeader.tsxindex cee779a0831..cc769eb058c 100644--- a/frontend/src/metabase/browse/components/BrowseDataHeader.tsx+++ b/frontend/src/metabase/browse/components/BrowseDataHeader.tsx@@ -23,7 +23,7 @@ export const BrowseDataHeader = () => {justify="space-between"align="center">- <Title order={2} c="text-dark">+ <Title order={2} c="text-primary"><Group gap="sm"><Icon size={24} c="brand" name="database" />{t`Databases`}diff --git a/frontend/src/metabase/browse/components/BrowseHeader.styled.tsx b/frontend/src/metabase/browse/components/BrowseHeader.styled.tsxindex 8df92e049ca..dbcfdcf9b50 100644--- a/frontend/src/metabase/browse/components/BrowseHeader.styled.tsx+++ b/frontend/src/metabase/browse/components/BrowseHeader.styled.tsx@@ -10,7 +10,7 @@ export const BrowseHeaderContent = styled.div`export const BrowseHeaderIconContainer = styled.div`display: flex;align-items: center;- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);&:hover {color: var(--mb-color-brand);diff --git a/frontend/src/metabase/browse/databases/BrowseDatabases.module.css b/frontend/src/metabase/browse/databases/BrowseDatabases.module.cssindex c7b82c4dd92..1c018193f22 100644--- a/frontend/src/metabase/browse/databases/BrowseDatabases.module.css+++ b/frontend/src/metabase/browse/databases/BrowseDatabases.module.css@@ -1,5 +1,5 @@.dbCard {- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);&:hover {color: var(--mb-color-brand);@@ -7,10 +7,10 @@}.addCard {- background-color: var(--mb-color-bg-medium);+ background-color: var(--mb-color-background-tertiary);&:hover {background-color: var(--mb-color-brand);- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);}}diff --git a/frontend/src/metabase/browse/metrics/BrowseMetrics.tsx b/frontend/src/metabase/browse/metrics/BrowseMetrics.tsxindex d03088a7cd2..88399b7e7d4 100644--- a/frontend/src/metabase/browse/metrics/BrowseMetrics.tsx+++ b/frontend/src/metabase/browse/metrics/BrowseMetrics.tsx@@ -82,13 +82,9 @@ export function BrowseMetrics() {justify="space-between"align="center">- <Title order={2} c="text-dark" id={titleId}>+ <Title order={2} c="text-primary" id={titleId}><Group gap="sm">- <Icon- size={24}- color="var(--mb-color-icon-primary)"- name="metric"- />+ <Icon size={24} c="icon-primary" name="metric" />{t`Metrics`}</Group></Title>diff --git a/frontend/src/metabase/browse/metrics/MetricsTable.tsx b/frontend/src/metabase/browse/metrics/MetricsTable.tsxindex 1ee5971c3f1..1971ab1fe08 100644--- a/frontend/src/metabase/browse/metrics/MetricsTable.tsx+++ b/frontend/src/metabase/browse/metrics/MetricsTable.tsx@@ -409,7 +409,7 @@ function MenuCell({ metric }: { metric?: MetricResult }) {variant="subtle"px="sm"aria-label={t`Metric options`}- c="text-dark"+ c="text-primary"><Icon name="ellipsis" /></Button>diff --git a/frontend/src/metabase/browse/models/BrowseModels.tsx b/frontend/src/metabase/browse/models/BrowseModels.tsxindex 94500d849be..e7dcfee5e90 100644--- a/frontend/src/metabase/browse/models/BrowseModels.tsx+++ b/frontend/src/metabase/browse/models/BrowseModels.tsx@@ -80,13 +80,9 @@ export const BrowseModels = () => {justify="space-between"align="center">- <Title order={2} c="text-dark" id={titleId}>+ <Title order={2} c="text-primary" id={titleId}><Group gap="sm">- <Icon- size={24}- color="var(--mb-color-icon-primary)"- name="model"- />+ <Icon size={24} c="icon-primary" name="model" />{t`Models`}</Group></Title>diff --git a/frontend/src/metabase/browse/models/ModelExplanationBanner.tsx b/frontend/src/metabase/browse/models/ModelExplanationBanner.tsxindex 45d7e45ddee..e797e2e9c49 100644--- a/frontend/src/metabase/browse/models/ModelExplanationBanner.tsx+++ b/frontend/src/metabase/browse/models/ModelExplanationBanner.tsx@@ -35,7 +35,7 @@ export const ModelExplanationBanner = () => {return (<Paper- color="text-dark"+ color="text-primary"bg="transparent"shadow="0"radius="0.25rem"diff --git a/frontend/src/metabase/browse/models/ModelsTable.tsx b/frontend/src/metabase/browse/models/ModelsTable.tsxindex 425bd53ccf6..81e7b560ed9 100644--- a/frontend/src/metabase/browse/models/ModelsTable.tsx+++ b/frontend/src/metabase/browse/models/ModelsTable.tsx@@ -219,12 +219,7 @@ function NameCell({ model }: { model?: ModelResult }) {}}onClick={preventDefault}>- <Icon- size={16}- {...icon}- color="var(--mb-color-icon-primary)"- style={{ flexShrink: 0 }}- />+ <Icon size={16} {...icon} c="icon-primary" style={{ flexShrink: 0 }} />{<EntityItem.Namename={model?.name || ""}diff --git a/frontend/src/metabase/browse/models/RecentModels.tsx b/frontend/src/metabase/browse/models/RecentModels.tsxindex 37961ea327e..0f758df2cc2 100644--- a/frontend/src/metabase/browse/models/RecentModels.tsx+++ b/frontend/src/metabase/browse/models/RecentModels.tsx@@ -31,7 +31,7 @@ export function RecentModels({id={skeleton ? undefined : headingId}fw="bold"fz={16}- color="text-dark"+ color="text-primary"mb="lg"style={{ visibility: skeleton ? "hidden" : undefined }}>{t`Recents`}</Text>diff --git a/frontend/src/metabase/browse/tables/TableBrowser/TableBrowser.jsx b/frontend/src/metabase/browse/tables/TableBrowser/TableBrowser.jsxindex 729c2afa00b..86c812f3a8f 100644--- a/frontend/src/metabase/browse/tables/TableBrowser/TableBrowser.jsx+++ b/frontend/src/metabase/browse/tables/TableBrowser/TableBrowser.jsx@@ -169,7 +169,7 @@ const TableBrowserItemButtons = ({onClick={handleEditTableClicked}size="sm"tooltip={t`Edit this table`}- color="text-medium"+ color="text-secondary"aria-label={t`Edit this table`}data-testid="edit-table-icon">@@ -181,7 +181,7 @@ const TableBrowserItemButtons = ({to={`/reference/databases/${dbId}/tables/${tableId}`}size="sm"tooltip={t`Learn about this table`}- color="text-medium"+ color="text-secondary"aria-label={t`Learn about this table`}><Icon name="reference" />diff --git a/frontend/src/metabase/collections/components/ActionMenu/ActionMenu.styled.tsx b/frontend/src/metabase/collections/components/ActionMenu/ActionMenu.styled.tsxindex 61bf6bc768a..cb755b9ec80 100644--- a/frontend/src/metabase/collections/components/ActionMenu/ActionMenu.styled.tsx+++ b/frontend/src/metabase/collections/components/ActionMenu/ActionMenu.styled.tsx@@ -4,5 +4,5 @@ import styled from "@emotion/styled";import EntityItem from "metabase/common/components/EntityItem";export const EntityItemMenu = styled(EntityItem.Menu)`- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);`;diff --git a/frontend/src/metabase/collections/components/CollectionContent/CollectionContent.styled.tsx b/frontend/src/metabase/collections/components/CollectionContent/CollectionContent.styled.tsxindex f187a4fef32..99ee2c943c5 100644--- a/frontend/src/metabase/collections/components/CollectionContent/CollectionContent.styled.tsx+++ b/frontend/src/metabase/collections/components/CollectionContent/CollectionContent.styled.tsx@@ -5,7 +5,7 @@ export const CollectionRoot = styled.div`height: 100%;overflow: hidden;position: relative;- background-color: var(--mb-color-bg-secondary);+ background-color: var(--mb-color-background-secondary);`;export const CollectionMain = styled.div`diff --git a/frontend/src/metabase/collections/components/CollectionEmptyState/CollectionEmptyState.tsx b/frontend/src/metabase/collections/components/CollectionEmptyState/CollectionEmptyState.tsxindex 6f7ff5ee213..31719979136 100644--- a/frontend/src/metabase/collections/components/CollectionEmptyState/CollectionEmptyState.tsx+++ b/frontend/src/metabase/collections/components/CollectionEmptyState/CollectionEmptyState.tsx@@ -115,7 +115,7 @@ export const EmptyStateTitle = ({ children }: PropsWithChildren) => {const theme = useMantineTheme();return (<Box- c="text-dark"+ c="text-primary"fz={theme.other.collectionBrowser.emptyContent.title.fontSize}fw="bold"lh="2rem"@@ -132,7 +132,7 @@ export const EmptyStateSubtitle = ({ children }: PropsWithChildren) => {return (<Textfz={theme.other.collectionBrowser.emptyContent.subtitle.fontSize}- c="text-medium"+ c="text-secondary"ta="center"mb="1.5rem"maw="25rem"diff --git a/frontend/src/metabase/collections/components/CollectionHeader/CollectionCaption.tsx b/frontend/src/metabase/collections/components/CollectionHeader/CollectionCaption.tsxindex ffc99d96847..7df14f736a4 100644--- a/frontend/src/metabase/collections/components/CollectionHeader/CollectionCaption.tsx+++ b/frontend/src/metabase/collections/components/CollectionHeader/CollectionCaption.tsx@@ -106,14 +106,14 @@ const CollectionCaptionIcon = ({ collection }: { collection: Collection }) => {}if (isRootTrashCollection(collection)) {- return <Icon name="trash" size={24} c="text-disabled" />;+ return <Icon name="trash" size={24} c="text-tertiary" />;}if (collection.archived &&PLUGIN_COLLECTIONS.isRegularCollection(collection)) {- return <Icon name="folder" size={24} c="text-disabled" />;+ return <Icon name="folder" size={24} c="text-tertiary" />;}return (diff --git a/frontend/src/metabase/collections/components/CollectionHeader/CollectionHeader.styled.tsx b/frontend/src/metabase/collections/components/CollectionHeader/CollectionHeader.styled.tsxindex 17b5729ecf6..0132dfdffbb 100644--- a/frontend/src/metabase/collections/components/CollectionHeader/CollectionHeader.styled.tsx+++ b/frontend/src/metabase/collections/components/CollectionHeader/CollectionHeader.styled.tsx@@ -44,7 +44,7 @@ export const CollectionHeaderButton = styled(&:hover {color: var(--mb-color-brand);- background-color: var(--mb-color-bg-medium);+ background-color: var(--mb-color-background-tertiary);}${Button.Content} {diff --git a/frontend/src/metabase/collections/components/CollectionHeader/CollectionUpload.styled.tsx b/frontend/src/metabase/collections/components/CollectionHeader/CollectionUpload.styled.tsxindex b3b3b1e68af..2cea35bc914 100644--- a/frontend/src/metabase/collections/components/CollectionHeader/CollectionUpload.styled.tsx+++ b/frontend/src/metabase/collections/components/CollectionHeader/CollectionUpload.styled.tsx@@ -7,7 +7,7 @@ export const InfoModalTitle = styled.h2``;export const InfoModalBody = styled.div`- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);`;export const NewBadge = styled.div`diff --git a/frontend/src/metabase/collections/components/CollectionMenu/CollectionMenu.tsx b/frontend/src/metabase/collections/components/CollectionMenu/CollectionMenu.tsxindex 37774f8967a..32c09f902b0 100644--- a/frontend/src/metabase/collections/components/CollectionMenu/CollectionMenu.tsx+++ b/frontend/src/metabase/collections/components/CollectionMenu/CollectionMenu.tsx@@ -152,7 +152,7 @@ export const CollectionMenu = ({data-testid="menu-indicator-root"><ActionIcon size={32} variant="viewHeader">- <Icon name="ellipsis" color="text-dark" />+ <Icon name="ellipsis" c="text-primary" /></ActionIcon></Indicator></Tooltip>diff --git a/frontend/src/metabase/collections/components/PinDropZone/PinDropZone.styled.tsx b/frontend/src/metabase/collections/components/PinDropZone/PinDropZone.styled.tsxindex f2bc17cd7ec..93c2d3565df 100644--- a/frontend/src/metabase/collections/components/PinDropZone/PinDropZone.styled.tsx+++ b/frontend/src/metabase/collections/components/PinDropZone/PinDropZone.styled.tsx@@ -39,7 +39,9 @@ export const PinDropTargetIndicator = styled.div<PinDropTargetRenderArgs>`right: 0;border-left: ${(props) =>`4px solid ${- props.hovered ? "var(--mb-color-brand)" : "var(--mb-color-bg-medium)"+ props.hovered+ ? "var(--mb-color-brand)"+ : "var(--mb-color-background-tertiary)"}`};display: ${(props) => !(props.hovered || props.highlighted) && "none"};min-height: 2rem;diff --git a/frontend/src/metabase/collections/components/PinnedItemCard/PinnedItemCard.styled.tsx b/frontend/src/metabase/collections/components/PinnedItemCard/PinnedItemCard.styled.tsxindex 7122b717568..09dc36f9bed 100644--- a/frontend/src/metabase/collections/components/PinnedItemCard/PinnedItemCard.styled.tsx+++ b/frontend/src/metabase/collections/components/PinnedItemCard/PinnedItemCard.styled.tsx@@ -40,7 +40,7 @@ export const Title = styled.div`font-weight: bold;font-size: 1rem;line-height: 1.5rem;- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);transition: color 0.2s ease;white-space: nowrap;text-overflow: ellipsis;@@ -48,7 +48,7 @@ export const Title = styled.div``;export const Description = styled(MarkdownPreview)`- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);`;export const Body = styled.div`diff --git a/frontend/src/metabase/collections/components/PinnedItemOverview/PinnedItemOverview.tsx b/frontend/src/metabase/collections/components/PinnedItemOverview/PinnedItemOverview.tsxindex e60ad3963ea..b0628c71daf 100644--- a/frontend/src/metabase/collections/components/PinnedItemOverview/PinnedItemOverview.tsx+++ b/frontend/src/metabase/collections/components/PinnedItemOverview/PinnedItemOverview.tsx@@ -285,7 +285,7 @@ function SectionTitle({ title, description, icon }: SectionTitleProps) {{icon && <Icon name={icon} c="brand" />}<h3>{title}</h3></Group>- {description && <Box c="text-medium">{description}</Box>}+ {description && <Box c="text-secondary">{description}</Box>}</Stack>);}diff --git a/frontend/src/metabase/collections/components/PinnedItemSortDropTarget/PinnedItemSortDropTarget.styled.tsx b/frontend/src/metabase/collections/components/PinnedItemSortDropTarget/PinnedItemSortDropTarget.styled.tsxindex 01b03692660..f155f21ab52 100644--- a/frontend/src/metabase/collections/components/PinnedItemSortDropTarget/PinnedItemSortDropTarget.styled.tsx+++ b/frontend/src/metabase/collections/components/PinnedItemSortDropTarget/PinnedItemSortDropTarget.styled.tsx@@ -44,12 +44,12 @@ export const PinDropTargetIndicator = styled.div<PinDropTargetRenderArgs>`border-left: ${(props) =>props.isFrontTarget &&`4px solid ${- props.hovered ? color("brand") : "var(--mb-color-bg-medium)"+ props.hovered ? color("brand") : "var(--mb-color-background-tertiary)"}`};border-right: ${(props) =>props.isBackTarget &&`4px solid ${- props.hovered ? color("brand") : "var(--mb-color-bg-medium)"+ props.hovered ? color("brand") : "var(--mb-color-background-tertiary)"}`};display: ${(props) => !(props.hovered || props.highlighted) && "none"};`;diff --git a/frontend/src/metabase/collections/components/PinnedQuestionCard/PinnedQuestionCard.styled.tsx b/frontend/src/metabase/collections/components/PinnedQuestionCard/PinnedQuestionCard.styled.tsxindex cf32c3ad365..3810585a288 100644--- a/frontend/src/metabase/collections/components/PinnedQuestionCard/PinnedQuestionCard.styled.tsx+++ b/frontend/src/metabase/collections/components/PinnedQuestionCard/PinnedQuestionCard.styled.tsx@@ -12,7 +12,7 @@ export const CardActionMenuContainer = styled.div`top: 0.3125rem;right: 0.3125rem;z-index: 3;- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);visibility: hidden;`;@@ -39,7 +39,7 @@ export const CardRoot = styled(padding: ${(props) => (props.isPreview ? "0" : "0.5rem 0")};border: 1px solid var(--mb-color-border);border-radius: 0.375rem;- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);&:hover {${CardActionMenuContainer} {diff --git a/frontend/src/metabase/collections/components/PinnedQuestionCard/PinnedQuestionCard.tsx b/frontend/src/metabase/collections/components/PinnedQuestionCard/PinnedQuestionCard.tsxindex 0fbb598e7da..882e80c8468 100644--- a/frontend/src/metabase/collections/components/PinnedQuestionCard/PinnedQuestionCard.tsx+++ b/frontend/src/metabase/collections/components/PinnedQuestionCard/PinnedQuestionCard.tsx@@ -98,7 +98,7 @@ const PinnedQuestionCard = ({<IconclassName={cx(CS.hoverChild, CS.hoverChildSmooth)}name="info"- color="text-light"+ c="text-tertiary"tooltip={item.description}/>)}diff --git a/frontend/src/metabase/comments/components/CommentEditor/CommentEditor.module.css b/frontend/src/metabase/comments/components/CommentEditor/CommentEditor.module.cssindex 4f32d71aa5d..37bbf4d20be 100644--- a/frontend/src/metabase/comments/components/CommentEditor/CommentEditor.module.css+++ b/frontend/src/metabase/comments/components/CommentEditor/CommentEditor.module.css@@ -64,7 +64,7 @@height: 100%;min-height: 1.25rem;line-height: 1.5;- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);font-size: var(--mantine-font-size-md);white-space: pre-wrap;word-break: break-word;@@ -83,8 +83,8 @@.content:global(.ProseMirror):global(pre):not(:global(.editor-style-boundary) *) {- background-color: var(--mb-color-background-light);- color: var(--mb-color-text-dark);+ background-color: var(--mb-color-background-secondary);+ color: var(--mb-color-text-primary);padding: 0.5rem;border-radius: var(--mantine-radius-xs);overflow-x: auto;@@ -106,12 +106,12 @@.content:global(.ProseMirror):global(code):not(:global(.editor-style-boundary) *) {- background-color: var(--mb-color-background-light);+ background-color: var(--mb-color-background-secondary);padding: 0.125rem 0.375rem;border-radius: var(--mantine-radius-xs);font-family: var(--mb-default-monospace-font-family, monospace);font-size: 0.875rem;- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);border: 1px solid var(--mb-color-border);}@@ -119,11 +119,11 @@.content:global(.ProseMirror):global(blockquote):not(:global(.editor-style-boundary) *) {- border-left: 3px solid var(--mb-color-border-dark);+ border-left: 3px solid var(--mb-color-border-strong);margin: 0 0 0.5rem 0;- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);font-style: italic;- background-color: var(--mb-color-background-light);+ background-color: var(--mb-color-background-secondary);padding: 0.5rem;padding-left: 0.75rem;border-radius: var(--mantine-radius-xs);@@ -180,7 +180,7 @@/* Placeholder styling */.content :global(.is-empty:first-child:before) {- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);content: attr(data-placeholder);height: 0;pointer-events: none;diff --git a/frontend/src/metabase/comments/components/Discussion/Discussion.module.css b/frontend/src/metabase/comments/components/Discussion/Discussion.module.cssindex 272bdd7a69e..d7d386c96be 100644--- a/frontend/src/metabase/comments/components/Discussion/Discussion.module.css+++ b/frontend/src/metabase/comments/components/Discussion/Discussion.module.css@@ -49,8 +49,8 @@}.commentBulletDeleted {- background-color: var(--mb-color-background);- color: var(--mb-color-text-disabled);+ background-color: var(--mb-color-background-primary);+ color: var(--mb-color-text-tertiary);}.reaction {@@ -58,10 +58,10 @@border: none;outline: none;cursor: pointer;- background-color: var(--mb-color-bg-medium);+ background-color: var(--mb-color-background-tertiary);padding: 0 0.5rem;border-radius: 1rem;- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);&:hover {background-color: var(--mb-color-background-hover);diff --git a/frontend/src/metabase/comments/components/Discussion/Discussion.tsx b/frontend/src/metabase/comments/components/Discussion/Discussion.tsxindex 5d5959c3579..be3cc45cb89 100644--- a/frontend/src/metabase/comments/components/Discussion/Discussion.tsx+++ b/frontend/src/metabase/comments/components/Discussion/Discussion.tsx@@ -65,7 +65,7 @@ export const Discussion = ({if (error) {sendToast({icon: "warning_triangle_filled",- iconColor: "var(--mb-color-warning)",+ iconColor: "warning",message: t`Failed to send comment`,});}@@ -77,7 +77,7 @@ export const Discussion = ({if (error) {sendToast({icon: "warning_triangle_filled",- iconColor: "var(--mb-color-warning)",+ iconColor: "warning",message: t`Failed to delete comment`,});}@@ -92,7 +92,7 @@ export const Discussion = ({if (error) {sendToast({icon: "warning_triangle_filled",- iconColor: "var(--mb-color-warning)",+ iconColor: "warning",message: t`Failed to resolve comment`,});}@@ -107,7 +107,7 @@ export const Discussion = ({if (error) {sendToast({icon: "warning_triangle_filled",- iconColor: "var(--mb-color-warning)",+ iconColor: "warning",message: t`Failed to unresolve comment`,});}@@ -125,7 +125,7 @@ export const Discussion = ({if (error) {sendToast({icon: "warning_triangle_filled",- iconColor: "var(--mb-color-warning)",+ iconColor: "warning",message: t`Failed to update comment`,});}@@ -149,7 +149,7 @@ export const Discussion = ({if (error) {sendToast({icon: "warning_triangle_filled",- iconColor: "var(--mb-color-warning)",+ iconColor: "warning",message: t`Failed to add reaction`,});}@@ -161,7 +161,7 @@ export const Discussion = ({if (error) {sendToast({icon: "warning_triangle_filled",- iconColor: "var(--mb-color-warning)",+ iconColor: "warning",message: t`Failed to remove reaction`,});}diff --git a/frontend/src/metabase/comments/components/Discussion/DiscussionComment.tsx b/frontend/src/metabase/comments/components/Discussion/DiscussionComment.tsxindex 89bc06eb93f..aeb2b40bb29 100644--- a/frontend/src/metabase/comments/components/Discussion/DiscussionComment.tsx+++ b/frontend/src/metabase/comments/components/Discussion/DiscussionComment.tsx@@ -78,7 +78,7 @@ export function DiscussionComment({aria-current={isTarget ? "location" : undefined}data-testid="discussion-comment-deleted">- <Text size="md" c="text-disabled" fs="italic">+ <Text size="md" c="text-tertiary" fs="italic">{t`This comment was deleted.`}</Text><DiscussionActionPanel@@ -126,7 +126,7 @@ export function DiscussionComment({<Tooltip label={TOOLTIP_DATE_FORMAT.format(commentDate)}><Textsize="xs"- c="text-medium"+ c="text-secondary"lh={1.1}style={{ whiteSpace: "nowrap" }}>diff --git a/frontend/src/metabase/common/components/AccordionList/AccordionListCell.module.css b/frontend/src/metabase/common/components/AccordionList/AccordionListCell.module.cssindex 97952a2aba2..8c78b9285c7 100644--- a/frontend/src/metabase/common/components/AccordionList/AccordionListCell.module.css+++ b/frontend/src/metabase/common/components/AccordionList/AccordionListCell.module.css@@ -19,7 +19,7 @@}.action {- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);&:hover {color: inherit;@@ -30,5 +30,5 @@position: sticky;z-index: 10;top: 0;- background: var(--mb-color-bg-white);+ background: var(--mb-color-background-primary);}diff --git a/frontend/src/metabase/common/components/AdminLayout/AdminSettingsLayout.module.css b/frontend/src/metabase/common/components/AdminLayout/AdminSettingsLayout.module.cssindex 877200c6645..ad1542e2fff 100644--- a/frontend/src/metabase/common/components/AdminLayout/AdminSettingsLayout.module.css+++ b/frontend/src/metabase/common/components/AdminLayout/AdminSettingsLayout.module.css@@ -23,5 +23,5 @@justify-content: center;width: 100%;position: relative;- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);}diff --git a/frontend/src/metabase/common/components/AggregationPicker/AggregationPicker.styled.tsx b/frontend/src/metabase/common/components/AggregationPicker/AggregationPicker.styled.tsxindex 6b84142c1dc..6a564af47a2 100644--- a/frontend/src/metabase/common/components/AggregationPicker/AggregationPicker.styled.tsx+++ b/frontend/src/metabase/common/components/AggregationPicker/AggregationPicker.styled.tsx@@ -6,7 +6,7 @@ export const ColumnPickerHeaderContainer = styled.div`align-items: center;padding: 1rem 0.5rem;border-bottom: 1px solid var(--mb-color-border);- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);`;export const ColumnPickerHeaderTitleContainer = styled.a`diff --git a/frontend/src/metabase/common/components/Alert/Alert.styled.tsx b/frontend/src/metabase/common/components/Alert/Alert.styled.tsxindex 57f94b8e879..378b4a77446 100644--- a/frontend/src/metabase/common/components/Alert/Alert.styled.tsx+++ b/frontend/src/metabase/common/components/Alert/Alert.styled.tsx@@ -15,17 +15,17 @@ interface AlertRootProps {const colorsByVariant = {border: {- info: "var(--mb-color-bg-medium)",+ info: "var(--mb-color-background-tertiary)",error: color("error"),warning: color("warning"),},background: {- info: "var(--mb-color-bg-light)",+ info: "var(--mb-color-background-secondary)",error: color("background-error"),- warning: color("bg-yellow"),+ warning: color("background-warning"),},icon: {- info: color("text-dark"),+ info: color("text-primary"),error: color("error"),warning: color("warning"),},@@ -36,7 +36,7 @@ export const AlertRoot = styled.div<AlertRootProps>`align-items: center;padding: 1.25rem 1rem;line-height: 1.4rem;- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);${(props) =>props.hasBorder? css`diff --git a/frontend/src/metabase/common/components/AnsiLogs/AnsiLogs.module.css b/frontend/src/metabase/common/components/AnsiLogs/AnsiLogs.module.cssindex 30e417dfb4b..86dac0aec42 100644--- a/frontend/src/metabase/common/components/AnsiLogs/AnsiLogs.module.css+++ b/frontend/src/metabase/common/components/AnsiLogs/AnsiLogs.module.css@@ -13,8 +13,8 @@}.react-ansi-style-inverse {- color: var(--mb-color-text-dark);- background-color: var(--mb-color-bg-white);+ color: var(--mb-color-text-primary);+ background-color: var(--mb-color-background-primary);}.react-ansi-style-hidden {@@ -30,15 +30,15 @@}.react-ansi-style-black {- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);}.react-ansi-style-white {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);}.react-ansi-style-gray {- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);}.react-ansi-style-red {diff --git a/frontend/src/metabase/common/components/Badge/Badge.tsx b/frontend/src/metabase/common/components/Badge/Badge.tsxindex c79ad3fff7b..351c5cfb20e 100644--- a/frontend/src/metabase/common/components/Badge/Badge.tsx+++ b/frontend/src/metabase/common/components/Badge/Badge.tsx@@ -35,7 +35,7 @@ export const Badge = ({className,to,icon,- inactiveColor = "text-medium",+ inactiveColor = "text-secondary",activeColor = "brand",isSingleLine = false,onClick,diff --git a/frontend/src/metabase/common/components/Banner/Banner.stories.tsx b/frontend/src/metabase/common/components/Banner/Banner.stories.tsxindex 4f0d287eef5..264c741d40a 100644--- a/frontend/src/metabase/common/components/Banner/Banner.stories.tsx+++ b/frontend/src/metabase/common/components/Banner/Banner.stories.tsx@@ -15,10 +15,10 @@ export const Default = {render: (args: BannerProps) => <Banner {...args} />,args: {icon: "warning_round_filled",- bg: "var(--mb-color-background-inverse)",- iconColor: "var(--mb-color-text-white)",+ bg: "var(--mb-color-background-primary-inverse)",+ iconColor: "var(--mb-color-text-primary-inverse)",body: (- <Text lh="inherit" c="text-white">+ <Text lh="inherit" c="text-primary-inverse">This is a banner</Text>),@@ -40,7 +40,7 @@ export const NonClosable = {closable: false,bg: "var(--mb-color-success)",body: (- <Text lh="inherit" c="text-white">+ <Text lh="inherit" c="text-primary-inverse">This is a banner</Text>),diff --git a/frontend/src/metabase/common/components/Banner/Banner.tsx b/frontend/src/metabase/common/components/Banner/Banner.tsxindex bbb57820c62..688f4b3fd38 100644--- a/frontend/src/metabase/common/components/Banner/Banner.tsx+++ b/frontend/src/metabase/common/components/Banner/Banner.tsx@@ -1,12 +1,13 @@import type { ReactNode } from "react";import CS from "metabase/css/core/index.css";+import type { ColorName } from "metabase/lib/colors/types";import type { FlexProps, IconName } from "metabase/ui";import { Flex, Group, Icon } from "metabase/ui";interface BaseBannerProps extends FlexProps {icon?: IconName;- iconColor?: string;+ iconColor?: ColorName;body: ReactNode;}@@ -27,7 +28,7 @@ export const Banner = ({<Flexdata-testid="app-banner"align="center"- bg={bg || "bg-medium"}+ bg={bg || "background-tertiary"}py="sm"justify="space-between"pl="1.325rem"@@ -35,7 +36,7 @@ export const Banner = ({{...flexProps}><Group gap="xs">- {icon && <Icon name={icon} w={36} color={iconColor} />}+ {icon && <Icon name={icon} w={36} c={iconColor} />}{body}</Group>{closable && (@@ -44,7 +45,7 @@ export const Banner = ({name="close"onClick={onClose}w={36}- color={iconColor}+ c={iconColor}/>)}</Flex>diff --git a/frontend/src/metabase/common/components/BookmarkToggle/BookmarkToggle.tsx b/frontend/src/metabase/common/components/BookmarkToggle/BookmarkToggle.tsxindex 7ec09a40bc8..1a55aca8039 100644--- a/frontend/src/metabase/common/components/BookmarkToggle/BookmarkToggle.tsx+++ b/frontend/src/metabase/common/components/BookmarkToggle/BookmarkToggle.tsx@@ -1,13 +1,13 @@import cx from "classnames";-import type { HTMLAttributes, Ref } from "react";+import type { Ref } from "react";import { forwardRef, useCallback, useState } from "react";import { t } from "ttag";-import { ActionIcon, Icon, Tooltip } from "metabase/ui";+import { ActionIcon, type ActionIconProps, Icon, Tooltip } from "metabase/ui";import S from "./BookmarkToggle.module.css";-export interface BookmarkToggleProps extends HTMLAttributes<HTMLButtonElement> {+export interface BookmarkToggleProps extends ActionIconProps {isBookmarked: boolean;tooltipPlacement?: "top" | "bottom";onCreateBookmark: () => void;diff --git a/frontend/src/metabase/common/components/Breadcrumbs/Breadcrumbs.module.css b/frontend/src/metabase/common/components/Breadcrumbs/Breadcrumbs.module.cssindex 452545da67b..bf2698efee0 100644--- a/frontend/src/metabase/common/components/Breadcrumbs/Breadcrumbs.module.css+++ b/frontend/src/metabase/common/components/Breadcrumbs/Breadcrumbs.module.css@@ -1,10 +1,10 @@:root {- --breadcrumbs-color: var(--mb-color-text-light);- --breadcrumb-page-color: var(--mb-color-text-dark);+ --breadcrumbs-color: var(--mb-color-text-tertiary);+ --breadcrumb-page-color: var(--mb-color-text-primary);--breadcrumb-divider-spacing: 0.75em;/* taken from Sidebar.css, should probably factor them out into variables */- --sidebar-breadcrumbs-color: var(--mb-color-text-medium);+ --sidebar-breadcrumbs-color: var(--mb-color-text-secondary);}.breadcrumbs {diff --git a/frontend/src/metabase/common/components/BrowserCrumbs/BrowserCrumbs.module.css b/frontend/src/metabase/common/components/BrowserCrumbs/BrowserCrumbs.module.cssindex a29152053fe..7b1a6e35fbf 100644--- a/frontend/src/metabase/common/components/BrowserCrumbs/BrowserCrumbs.module.css+++ b/frontend/src/metabase/common/components/BrowserCrumbs/BrowserCrumbs.module.css@@ -18,5 +18,5 @@.icon {margin: 0 0.5rem;- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);}diff --git a/frontend/src/metabase/common/components/BulkActionBar/BulkActionBar.module.css b/frontend/src/metabase/common/components/BulkActionBar/BulkActionBar.module.cssindex c5762e52e32..39d3104e2f4 100644--- a/frontend/src/metabase/common/components/BulkActionBar/BulkActionBar.module.css+++ b/frontend/src/metabase/common/components/BulkActionBar/BulkActionBar.module.css@@ -1,28 +1,32 @@.BulkActionButton:not([data-css-specificity-hack="🤣"]) {- color: var(--mb-color-text-white);- border-color: color-mix(in srgb, var(--mb-color-bg-light), transparent 100%);+ color: var(--mb-color-text-primary-inverse);+ border-color: color-mix(+ in srgb,+ var(--mb-color-background-secondary),+ transparent 100%+ );background-color: color-mix(in srgb,- var(--mb-color-bg-light),+ var(--mb-color-background-secondary),transparent 90%);&:hover {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);border-color: color-mix(in srgb,- var(--mb-color-background),+ var(--mb-color-background-primary),transparent 100%);background-color: color-mix(in srgb,- var(--mb-color-bg-light),+ var(--mb-color-background-secondary),transparent 70%);}&:disabled {- color: var(--mb-color-text-disabled-inverse);+ color: var(--mb-color-text-tertiary-inverse);border-color: color-mix(in srgb,var(--mb-color-background-disabled-inverse),@@ -34,10 +38,10 @@.BulkActionDangerButton:not([data-css-specificity-hack="🤣"]) {&:hover {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);border-color: color-mix(in srgb,- var(--mb-color-background),+ var(--mb-color-background-primary),transparent 100%);background-color: var(--mb-color-error);@@ -47,12 +51,12 @@color: var(--mb-color-text-tertiary);border-color: color-mix(in srgb,- var(--mb-color-background),+ var(--mb-color-background-primary),transparent 100%);background-color: color-mix(in srgb,- var(--mb-color-background),+ var(--mb-color-background-primary),transparent 90%);}diff --git a/frontend/src/metabase/common/components/BulkActionBar/BulkActionBar.styled.tsx b/frontend/src/metabase/common/components/BulkActionBar/BulkActionBar.styled.tsxindex de7290ee19c..08b0980154c 100644--- a/frontend/src/metabase/common/components/BulkActionBar/BulkActionBar.styled.tsx+++ b/frontend/src/metabase/common/components/BulkActionBar/BulkActionBar.styled.tsx@@ -15,7 +15,7 @@ export const BulkActionsToast = styled.div<{ isNavbarOpen: boolean }>``;export const ToastCard = styled(Card)`- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);padding: 0.75rem var(--mantine-spacing-md);display: flex;align-items: center;diff --git a/frontend/src/metabase/common/components/BulkActionBar/BulkActionBar.tsx b/frontend/src/metabase/common/components/BulkActionBar/BulkActionBar.tsxindex 3cfff104eda..9309ef04997 100644--- a/frontend/src/metabase/common/components/BulkActionBar/BulkActionBar.tsx+++ b/frontend/src/metabase/common/components/BulkActionBar/BulkActionBar.tsx@@ -49,7 +49,7 @@ export const BulkActionBarPortal = ({className={cx(className, Animation.popToast)}><Box component={ToastCard} dark data-testid="toast-card" {...props}>- {message && <Text color="text-white">{message}</Text>}+ {message && <Text color="text-primary-inverse">{message}</Text>}<Flex gap="sm" align="center">{children}</Flex>diff --git a/frontend/src/metabase/common/components/Button/Button.styled.tsx b/frontend/src/metabase/common/components/Button/Button.styled.tsxindex b69b5d45e92..47ba2dbaa6e 100644--- a/frontend/src/metabase/common/components/Button/Button.styled.tsx+++ b/frontend/src/metabase/common/components/Button/Button.styled.tsx@@ -25,12 +25,12 @@ export const ButtonRoot = styled.button<ButtonRootProps>`${({ purple, theme }) =>purple &&css`- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);background-color: var(--mb-color-filter);border: 1px solid var(--mb-color-filter);&:hover {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);background-color: ${alpha(theme.fn.themeColor("filter"), 0.88)};border-color: ${alpha(theme.fn.themeColor("filter"), 0.88)};}@@ -58,7 +58,7 @@ export const ButtonRoot = styled.button<ButtonRootProps>`color: var(--mb-color-brand);&:hover {- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);}`}`;diff --git a/frontend/src/metabase/common/components/Button/Button.tsx b/frontend/src/metabase/common/components/Button/Button.tsxindex cbbda89db41..e9f8eb8c361 100644--- a/frontend/src/metabase/common/components/Button/Button.tsx+++ b/frontend/src/metabase/common/components/Button/Button.tsx@@ -8,6 +8,7 @@ import _ from "underscore";import ButtonsS from "metabase/css/components/buttons.module.css";import CS from "metabase/css/core/index.css";import SpacingS from "metabase/css/core/spacing.module.css";+import type { ColorName } from "metabase/lib/colors/types";import { isNotNull } from "metabase/lib/types";import type { IconName } from "metabase/ui";import { Icon } from "metabase/ui";@@ -61,7 +62,7 @@ export interface ButtonProps extends ButtonHTMLAttributes<HTMLButtonElement> {icon?: IconName | ReactNode;iconSize?: number;- iconColor?: string;+ iconColor?: ColorName;iconRight?: IconName;iconVertical?: boolean;labelBreakpoint?: "sm";@@ -133,7 +134,7 @@ const BaseButton = forwardRef(function BaseButton({icon && typeof icon === "string" ? (<IconclassName={classNames.icon}- color={iconColor}+ c={iconColor}name={icon as unknown as IconName}size={iconSize ? iconSize : 16}/>@@ -155,7 +156,7 @@ const BaseButton = forwardRef(function BaseButton({iconRight && (<IconclassName={classNames.icon}- color={iconColor}+ c={iconColor}name={iconRight}size={iconSize ? iconSize : 16}/>diff --git a/frontend/src/metabase/common/components/Card/Card.tsx b/frontend/src/metabase/common/components/Card/Card.tsxindex dcbcfaee273..9d8ac2b1a7b 100644--- a/frontend/src/metabase/common/components/Card/Card.tsx+++ b/frontend/src/metabase/common/components/Card/Card.tsx@@ -14,8 +14,8 @@ type CardProps = {const Card = styled.div<CardProps>`background-color: ${(props) =>props.dark- ? "var(--mb-color-background-inverse)"- : "var(--mb-color-background)"};+ ? "var(--mb-color-background-primary-inverse)"+ : "var(--mb-color-background-primary)"};border: 1px solid${(props) => (props.dark ? "transparent" : "var(--mb-color-border)")};${(props) => props.dark && `color: white`};diff --git a/frontend/src/metabase/common/components/CheckBox/CheckBox.styled.tsx b/frontend/src/metabase/common/components/CheckBox/CheckBox.styled.tsxindex e8af69464f6..40c7702f8ff 100644--- a/frontend/src/metabase/common/components/CheckBox/CheckBox.styled.tsx+++ b/frontend/src/metabase/common/components/CheckBox/CheckBox.styled.tsx@@ -71,7 +71,9 @@ export const CheckBoxIconContainer = styled.span<CheckBoxIconContainerProps>`color(props.checked ? props.checkedColor : props.uncheckedColor)};border-radius: 0.25rem;background-color: ${(props) =>- props.checked ? color(props.checkedColor) : "var(--mb-color-bg-white)"};+ props.checked+ ? color(props.checkedColor)+ : "var(--mb-color-background-primary)"};`;export const CheckBoxLabel = styled.span<CheckBoxLabelProps>`diff --git a/frontend/src/metabase/common/components/CheckBox/constants.ts b/frontend/src/metabase/common/components/CheckBox/constants.tsindex cafc5366bed..2745bd505aa 100644--- a/frontend/src/metabase/common/components/CheckBox/constants.ts+++ b/frontend/src/metabase/common/components/CheckBox/constants.ts@@ -1,4 +1,4 @@export const DEFAULT_SIZE = 16;export const DEFAULT_ICON_PADDING = 4;export const DEFAULT_CHECKED_COLOR = "brand";-export const DEFAULT_UNCHECKED_COLOR = "text-light";+export const DEFAULT_UNCHECKED_COLOR = "text-tertiary";diff --git a/frontend/src/metabase/common/components/CodeMirror/CodeMirror.module.css b/frontend/src/metabase/common/components/CodeMirror/CodeMirror.module.cssindex ca8f7f85782..29ccfbb4869 100644--- a/frontend/src/metabase/common/components/CodeMirror/CodeMirror.module.css+++ b/frontend/src/metabase/common/components/CodeMirror/CodeMirror.module.css@@ -15,7 +15,7 @@}.cm-content {- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);background: none;padding-block: 8px;}@@ -25,14 +25,14 @@}.cm-gutters {- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);border: none;}.cm-gutterElement {font-weight: bold;font-size: 10px;- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);vertical-align: baseline;display: flex;align-items: center;@@ -69,7 +69,7 @@.cm-matchingBracket {background: none !important;- outline: 0.5px solid var(--mb-color-text-light);+ outline: 0.5px solid var(--mb-color-text-tertiary);border-radius: 2px;}@@ -85,7 +85,7 @@}.cm-completionDetail {- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);font-style: normal;text-align: right;overflow: hidden;@@ -107,8 +107,8 @@.cm-tooltip-autocomplete {box-shadow: 0 5px 14px rgba(0, 0, 0, 0.08);border-radius: 4px;- background-color: var(--mb-color-bg-white);- color: var(--mb-color-text-dark);+ background-color: var(--mb-color-background-primary);+ color: var(--mb-color-text-primary);border: 1px solid var(--mb-color-border);max-width: 520px;@@ -128,8 +128,8 @@&:hover,&[aria-selected="true"] {- background-color: var(--mb-color-bg-hover);- color: var(--mb-color-text-dark);+ background-color: var(--mb-color-background-secondary);+ color: var(--mb-color-text-primary);}}diff --git a/frontend/src/metabase/common/components/CollectionListView/CollectionListView.module.css b/frontend/src/metabase/common/components/CollectionListView/CollectionListView.module.cssindex 88f1970d5cc..db967ca6702 100644--- a/frontend/src/metabase/common/components/CollectionListView/CollectionListView.module.css+++ b/frontend/src/metabase/common/components/CollectionListView/CollectionListView.module.css@@ -3,7 +3,7 @@}.card {- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);}.card:hover {diff --git a/frontend/src/metabase/common/components/ColorPicker/ColorPicker.styled.tsx b/frontend/src/metabase/common/components/ColorPicker/ColorPicker.styled.tsxindex c95b585443f..0d6a1d37172 100644--- a/frontend/src/metabase/common/components/ColorPicker/ColorPicker.styled.tsx+++ b/frontend/src/metabase/common/components/ColorPicker/ColorPicker.styled.tsx@@ -53,7 +53,7 @@ export const HueContainer = styled.div``;const ControlsPointer = styled.div`- border: 2px solid var(--mb-color-bg-white);+ border: 2px solid var(--mb-color-background-primary);border-radius: 50%;pointer-events: none;`;diff --git a/frontend/src/metabase/common/components/ColorPill/ColorPill.module.css b/frontend/src/metabase/common/components/ColorPill/ColorPill.module.cssindex 721487c7eff..8fe0e9e3e5a 100644--- a/frontend/src/metabase/common/components/ColorPill/ColorPill.module.css+++ b/frontend/src/metabase/common/components/ColorPill/ColorPill.module.css@@ -6,15 +6,15 @@border-width: 1px;&:hover {- border-color: var(--mb-color-text-light);+ border-color: var(--mb-color-text-tertiary);}}.Selected {- border-color: var(--mb-color-text-light);+ border-color: var(--mb-color-text-tertiary);&:hover {- border-color: var(--mb-color-text-dark);+ border-color: var(--mb-color-text-primary);}}diff --git a/frontend/src/metabase/common/components/ColorRange/ColorRange.tsx b/frontend/src/metabase/common/components/ColorRange/ColorRange.tsxindex e2b2517f078..478904e088e 100644--- a/frontend/src/metabase/common/components/ColorRange/ColorRange.tsx+++ b/frontend/src/metabase/common/components/ColorRange/ColorRange.tsx@@ -52,7 +52,9 @@ export const ColorRange = forwardRef(function ColorRange()}>{_.range(0, sections).map((section) => (- <Box key={section} flex="1" bg={scale(section)} />+ <>+ <Box key={section} flex="1" bg={scale(section)} />+ </>))}</Flex>);diff --git a/frontend/src/metabase/common/components/ColorRangeSelector/ColorRangeToggle.tsx b/frontend/src/metabase/common/components/ColorRangeSelector/ColorRangeToggle.tsxindex 86b03e63688..bd56a95b85f 100644--- a/frontend/src/metabase/common/components/ColorRangeSelector/ColorRangeToggle.tsx+++ b/frontend/src/metabase/common/components/ColorRangeSelector/ColorRangeToggle.tsx@@ -36,7 +36,7 @@ const ColorRangeToggle = ({p="sm"size="lg">- <Icon c="text-medium" name="compare" />+ <Icon c="text-secondary" name="compare" /></ActionIcon>)}</Flex>diff --git a/frontend/src/metabase/common/components/CopyTextInput/CopyTextInput.styled.tsx b/frontend/src/metabase/common/components/CopyTextInput/CopyTextInput.styled.tsxindex ba8470320e3..6dd04717299 100644--- a/frontend/src/metabase/common/components/CopyTextInput/CopyTextInput.styled.tsx+++ b/frontend/src/metabase/common/components/CopyTextInput/CopyTextInput.styled.tsx@@ -18,7 +18,7 @@ export const CopyWidgetButton = styled(CopyButton)`cursor: pointer;&:hover {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);background-color: var(--mb-color-brand);}`;diff --git a/frontend/src/metabase/common/components/CopyWidget/CopyWidget.styled.tsx b/frontend/src/metabase/common/components/CopyWidget/CopyWidget.styled.tsxindex b485b14fa5e..2a8c5598fd5 100644--- a/frontend/src/metabase/common/components/CopyWidget/CopyWidget.styled.tsx+++ b/frontend/src/metabase/common/components/CopyWidget/CopyWidget.styled.tsx@@ -18,7 +18,7 @@ export const CopyWidgetButton = styled(CopyButton)`outline: none;&:hover {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);background-color: var(--mb-color-brand);}`;diff --git a/frontend/src/metabase/common/components/DashboardSelector/DashboardSelector.tsx b/frontend/src/metabase/common/components/DashboardSelector/DashboardSelector.tsxindex 34bdeb9af73..14cf8965acb 100644--- a/frontend/src/metabase/common/components/DashboardSelector/DashboardSelector.tsx+++ b/frontend/src/metabase/common/components/DashboardSelector/DashboardSelector.tsx@@ -47,7 +47,7 @@ export const DashboardSelector = ({if (error) {return (- <Group bg="bg-light" p="1rem">+ <Group bg="background-secondary" p="1rem"><Icon name="warning" />{t`Error loading dashboard.`}{" "}diff --git a/frontend/src/metabase/common/components/EditBar/EditBar.styled.tsx b/frontend/src/metabase/common/components/EditBar/EditBar.styled.tsxindex 97eafbcb036..475c8b6b371 100644--- a/frontend/src/metabase/common/components/EditBar/EditBar.styled.tsx+++ b/frontend/src/metabase/common/components/EditBar/EditBar.styled.tsx@@ -21,30 +21,30 @@ export const Root = styled(FullWidthContainer, {alpha(props.admin ? "accent7" : "brand", 0.85)};.${ButtonsS.Button} {- color: var(--mb-color-text-white);- background-color: ${() => alpha("bg-white", 0.1)};+ color: var(--mb-color-text-primary-inverse);+ background-color: ${() => alpha("background-primary", 0.1)};border: none;font-size: 1em;margin-left: 0.75em;}.${ButtonsS.ButtonPrimary} {- color: ${(props) => color(props.admin ? "text-dark" : "brand")};- background-color: var(--mb-color-bg-white);+ color: ${(props) => color(props.admin ? "text-primary" : "brand")};+ background-color: var(--mb-color-background-primary);}.${ButtonsS.Button}:hover {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);background-color: ${(props) => color(props.admin ? "accent7" : "brand")};}`;export const EditIcon = styled(Icon)`- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);`;export const Title = styled.span`- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);font-weight: 700;`;diff --git a/frontend/src/metabase/common/components/EmojiPicker/EmojiPicker.tsx b/frontend/src/metabase/common/components/EmojiPicker/EmojiPicker.tsxindex 467d167779b..2fe7077b1ce 100644--- a/frontend/src/metabase/common/components/EmojiPicker/EmojiPicker.tsx+++ b/frontend/src/metabase/common/components/EmojiPicker/EmojiPicker.tsx@@ -85,7 +85,7 @@ function CategoryHeader({...props}: EmojiPickerListCategoryHeaderProps) {return (- <Box px="sm" pos="sticky" top={0} bg="var(--mb-color-bg-white)" {...props}>+ <Box px="sm" pos="sticky" top={0} bg="background-primary" {...props}><Text fz="sm" c="text-secondary">{category.label}</Text>@@ -93,7 +93,11 @@ function CategoryHeader({);}-function Emoji({ emoji, ref, ...props }: EmojiPickerListEmojiProps) {+function Emoji({+ emoji,+ ref,+ ...props+}: Omit<EmojiPickerListEmojiProps, "color">) {return (<ActionIconc="text-primary"diff --git a/frontend/src/metabase/common/components/EmptyState/EmptyState.tsx b/frontend/src/metabase/common/components/EmptyState/EmptyState.tsxindex a8d240e9d22..389a987b861 100644--- a/frontend/src/metabase/common/components/EmptyState/EmptyState.tsx+++ b/frontend/src/metabase/common/components/EmptyState/EmptyState.tsx@@ -79,7 +79,7 @@ const EmptyState = ({</h2>)}{message && (- <Text role="status" color="text-medium" mt="xs">+ <Text role="status" color="text-secondary" mt="xs">{message}</Text>)}diff --git a/frontend/src/metabase/common/components/EntityIdCard/EntityIdCard.module.css b/frontend/src/metabase/common/components/EntityIdCard/EntityIdCard.module.cssindex afb3e4a33eb..7ec9e7563c5 100644--- a/frontend/src/metabase/common/components/EntityIdCard/EntityIdCard.module.css+++ b/frontend/src/metabase/common/components/EntityIdCard/EntityIdCard.module.css@@ -1,7 +1,7 @@.CopyButton {cursor: pointer;position: relative;- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);&:hover {color: var(--mb-color-brand);@@ -9,7 +9,7 @@}.InfoIcon {- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);&:hover {background-color: var(--mb-color-brand-lighter);diff --git a/frontend/src/metabase/common/components/EntityItem/EntityItem.styled.tsx b/frontend/src/metabase/common/components/EntityItem/EntityItem.styled.tsxindex 9881a78aac4..3cea74ad5af 100644--- a/frontend/src/metabase/common/components/EntityItem/EntityItem.styled.tsx+++ b/frontend/src/metabase/common/components/EntityItem/EntityItem.styled.tsx@@ -52,11 +52,11 @@ export const EntityItemWrapper = styled.div<{align-items: center;padding: ${(props) => getItemPadding(props.variant)};color: ${(props) =>- props.disabled ? color("text-medium") : color("text-dark")};+ props.disabled ? color("text-secondary") : color("text-primary")};&:hover {color: ${(props) =>- props.disabled ? color("text-medium") : color("brand")};+ props.disabled ? color("text-secondary") : color("brand")};}`;@@ -70,7 +70,7 @@ export const EntityItemSpinner = styled(LoadingSpinner)`export const EntityMenuContainer = styled.div`display: flex;align-items: center;- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);`;export const EntityItemActions = styled.div`diff --git a/frontend/src/metabase/common/components/EntityItem/EntityItem.tsx b/frontend/src/metabase/common/components/EntityItem/EntityItem.tsxindex 4507c00b9e1..2477ceb8842 100644--- a/frontend/src/metabase/common/components/EntityItem/EntityItem.tsx+++ b/frontend/src/metabase/common/components/EntityItem/EntityItem.tsx@@ -234,7 +234,7 @@ function EntityItemMenu({action: onDeletePermanently,color: "danger",hoverColor: "danger",- hoverBgColor: "bg-error",+ hoverBgColor: "background-error",});}diff --git a/frontend/src/metabase/common/components/EntityMenuItem/EntityMenuItem.styled.tsx b/frontend/src/metabase/common/components/EntityMenuItem/EntityMenuItem.styled.tsxindex 9cf759761ab..cbffbe97b5b 100644--- a/frontend/src/metabase/common/components/EntityMenuItem/EntityMenuItem.styled.tsx+++ b/frontend/src/metabase/common/components/EntityMenuItem/EntityMenuItem.styled.tsx@@ -20,7 +20,7 @@ export const MenuItemContent = styled.div<MenuItemProps>`border-radius: 0.5em;cursor: ${(props) => (props.disabled ? "not-allowed" : "pointer")};color: ${(props) =>- color(props.disabled ? "text-light" : props.color || "text-dark")};+ color(props.disabled ? "text-tertiary" : props.color || "text-primary")};padding: 0.85em 1.45em;text-decoration: none;@@ -30,12 +30,12 @@ export const MenuItemContent = styled.div<MenuItemProps>`background-color: ${(props) =>!props.disabled && props.hoverBgColor? color(props.hoverBgColor)- : "var(--mb-color-bg-light)"};+ : "var(--mb-color-background-secondary)"};}> .Icon {color: ${(props) =>- color(props.disabled ? "text-light" : props.color || "text-dark")};+ color(props.disabled ? "text-tertiary" : props.color || "text-primary")};margin-right: 0.65em;}diff --git a/frontend/src/metabase/common/components/EntityMenuTrigger/EntityMenuTrigger.styled.tsx b/frontend/src/metabase/common/components/EntityMenuTrigger/EntityMenuTrigger.styled.tsxindex 09fdebc8a0a..c77691d8677 100644--- a/frontend/src/metabase/common/components/EntityMenuTrigger/EntityMenuTrigger.styled.tsx+++ b/frontend/src/metabase/common/components/EntityMenuTrigger/EntityMenuTrigger.styled.tsx@@ -39,6 +39,6 @@ export const EntityMenuIconButton = styled(EntityMenuIconButtonInner)`background-color: ${({ hover }) =>hover?.backgroundColor? hover.backgroundColor- : "var(--mb-color-bg-medium)"};+ : "var(--mb-color-background-tertiary)"};}`;diff --git a/frontend/src/metabase/common/components/EntityPicker/components/EntityPickerModal/EntityPickerModal.tsx b/frontend/src/metabase/common/components/EntityPicker/components/EntityPickerModal/EntityPickerModal.tsxindex 2007aac951d..516baf9756b 100644--- a/frontend/src/metabase/common/components/EntityPicker/components/EntityPickerModal/EntityPickerModal.tsx+++ b/frontend/src/metabase/common/components/EntityPicker/components/EntityPickerModal/EntityPickerModal.tsx@@ -442,7 +442,7 @@ export function EntityPickerModal<px="2.5rem"pt="1rem"pb={hasTabs ? "1rem" : "1.5rem"}- bg="var(--mb-color-background)"+ bg="background-primary"><Modal.Title id={titleId} lh="2.5rem">{title}diff --git a/frontend/src/metabase/common/components/EntityPicker/components/LoadingSpinner/LoadingSpinner.tsx b/frontend/src/metabase/common/components/EntityPicker/components/LoadingSpinner/LoadingSpinner.tsxindex 62452e74a1d..78b80b70816 100644--- a/frontend/src/metabase/common/components/EntityPicker/components/LoadingSpinner/LoadingSpinner.tsx+++ b/frontend/src/metabase/common/components/EntityPicker/components/LoadingSpinner/LoadingSpinner.tsx@@ -12,7 +12,7 @@ export const LoadingSpinner = ({ text }: { text?: string }) => (gap="md"><Loader size="lg" />- {!!text && <Text color="text-medium">{text}</Text>}+ {!!text && <Text color="text-secondary">{text}</Text>}</Flex>);diff --git a/frontend/src/metabase/common/components/EntityPicker/components/NestedItemPicker/NestedItemPicker.styled.tsx b/frontend/src/metabase/common/components/EntityPicker/components/NestedItemPicker/NestedItemPicker.styled.tsxindex 0930065cb17..70878413496 100644--- a/frontend/src/metabase/common/components/EntityPicker/components/NestedItemPicker/NestedItemPicker.styled.tsx+++ b/frontend/src/metabase/common/components/EntityPicker/components/NestedItemPicker/NestedItemPicker.styled.tsx@@ -8,9 +8,9 @@ export const ListBox = styled(Box)<React.PropsWithChildren>`height: 100%;width: 365px;flex-basis: 365px;- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);&:last-child {- background-color: var(--mb-color-background);+ background-color: var(--mb-color-background-primary);}` as unknown as typeof Box;diff --git a/frontend/src/metabase/common/components/EntityPicker/components/RecentsTab/GroupedRecentsList.tsx b/frontend/src/metabase/common/components/EntityPicker/components/RecentsTab/GroupedRecentsList.tsxindex 725f1ed684f..ded654b08e9 100644--- a/frontend/src/metabase/common/components/EntityPicker/components/RecentsTab/GroupedRecentsList.tsx+++ b/frontend/src/metabase/common/components/EntityPicker/components/RecentsTab/GroupedRecentsList.tsx@@ -49,7 +49,7 @@ function RecentSection({}return (<Box pb="lg">- <Text fw="bold" color="text-light" mb="sm" pl="xs">+ <Text fw="bold" color="text-tertiary" mb="sm" pl="xs">{title}</Text><ChunkyList>diff --git a/frontend/src/metabase/common/components/EntityPicker/components/RecentsTab/RecentsTab.tsx b/frontend/src/metabase/common/components/EntityPicker/components/RecentsTab/RecentsTab.tsxindex 3167a6c8f94..acd9037bf37 100644--- a/frontend/src/metabase/common/components/EntityPicker/components/RecentsTab/RecentsTab.tsx+++ b/frontend/src/metabase/common/components/EntityPicker/components/RecentsTab/RecentsTab.tsx@@ -31,7 +31,7 @@ export const RecentsTab = <}return (- <Stack h="100%" bg="var(--mb-color-bg-light)">+ <Stack h="100%" bg="background-secondary">{recentItems.length > 0 ? (<GroupedRecentsListitems={recentItems}diff --git a/frontend/src/metabase/common/components/EntityPicker/components/ResultItem/ResultItem.styled.tsx b/frontend/src/metabase/common/components/EntityPicker/components/ResultItem/ResultItem.styled.tsxindex 77544b38bd6..872b10fefa3 100644--- a/frontend/src/metabase/common/components/EntityPicker/components/ResultItem/ResultItem.styled.tsx+++ b/frontend/src/metabase/common/components/EntityPicker/components/ResultItem/ResultItem.styled.tsx@@ -10,9 +10,13 @@ export const ChunkyListItem = styled.button<{padding: 1.5rem;cursor: pointer;background-color: ${({ isSelected }) =>- isSelected ? "var(--mb-color-brand)" : "var(--mb-color-bg-white)"};+ isSelected+ ? "var(--mb-color-brand)"+ : "var(--mb-color-background-primary)"};color: ${({ isSelected }) =>- isSelected ? "var(--mb-color-text-white)" : "var(--mb-color-text-dark)"};+ isSelected+ ? "var(--mb-color-text-primary-inverse)"+ : "var(--mb-color-text-primary)"};outline-offset: -3px;&:hover {@@ -20,7 +24,7 @@ export const ChunkyListItem = styled.button<{!isSelected &&css`background-color: var(--mb-color-brand-lighter);- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);`}}diff --git a/frontend/src/metabase/common/components/EntityPicker/components/ResultItem/ResultItem.tsx b/frontend/src/metabase/common/components/EntityPicker/components/ResultItem/ResultItem.tsxindex ca0782e6c30..6b7fca035e9 100644--- a/frontend/src/metabase/common/components/EntityPicker/components/ResultItem/ResultItem.tsx+++ b/frontend/src/metabase/common/components/EntityPicker/components/ResultItem/ResultItem.tsx@@ -36,7 +36,7 @@ export const ResultItem = ({><Flex gap="md" miw="10rem" align="center" style={{ flex: 1 }}><FixedSizeIcon- c={icon.color ?? (isSelected ? "text-white" : "brand")}+ c={icon.color ?? (isSelected ? "text-primary-inverse" : "brand")}name={icon.name}style={{flexShrink: 0,@@ -59,7 +59,7 @@ export const ResultItem = ({{parentInfo && (<Flex- c={isSelected ? "text-white" : "text-light"}+ c={isSelected ? "text-primary-inverse" : "text-tertiary"}align="center"gap="sm"w="20rem"diff --git a/frontend/src/metabase/common/components/EntityPicker/components/SearchTab/SearchTab.tsx b/frontend/src/metabase/common/components/EntityPicker/components/SearchTab/SearchTab.tsxindex 0b6c132f807..0697c372745 100644--- a/frontend/src/metabase/common/components/EntityPicker/components/SearchTab/SearchTab.tsx+++ b/frontend/src/metabase/common/components/EntityPicker/components/SearchTab/SearchTab.tsx@@ -47,7 +47,7 @@ export const SearchTab = <onSearchScopeChange,}: Props<Id, Model, Item>) => {return (- <Stack bg="bg-light" h="100%" gap={0}>+ <Stack bg="background-secondary" h="100%" gap={0}>{folder && (<Flex align="center" justify="space-between" p="xl"><Flex align="center">diff --git a/frontend/src/metabase/common/components/EntityPicker/utils.ts b/frontend/src/metabase/common/components/EntityPicker/utils.tsindex 7962352e0d8..f88bb4b4502 100644--- a/frontend/src/metabase/common/components/EntityPicker/utils.ts+++ b/frontend/src/metabase/common/components/EntityPicker/utils.ts@@ -37,7 +37,7 @@ export const getEntityPickerIcon = <Id, Model extends string>(}if (isSelected && !icon.color) {- icon.color = "text-white";+ icon.color = "text-primary-inverse";}if (icon.name === "folder" && isSelected) {diff --git a/frontend/src/metabase/common/components/ErrorDetails/ErrorDetails.styled.tsx b/frontend/src/metabase/common/components/ErrorDetails/ErrorDetails.styled.tsxindex 5ec2ee6b017..457f7e71d54 100644--- a/frontend/src/metabase/common/components/ErrorDetails/ErrorDetails.styled.tsx+++ b/frontend/src/metabase/common/components/ErrorDetails/ErrorDetails.styled.tsx@@ -8,7 +8,7 @@ export const MonospaceErrorDisplay = styled.div`margin-top: 0.5rem;font-weight: bold;border-radius: 0.5rem;- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);border: 1px solid var(--mb-color-border);max-height: 16rem;overflow-y: auto;diff --git a/frontend/src/metabase/common/components/ErrorPages/BugReportModal.tsx b/frontend/src/metabase/common/components/ErrorPages/BugReportModal.tsxindex bb4c89fc6f0..fcc252853f2 100644--- a/frontend/src/metabase/common/components/ErrorPages/BugReportModal.tsx+++ b/frontend/src/metabase/common/components/ErrorPages/BugReportModal.tsx@@ -78,7 +78,7 @@ export const BugReportModal = ({<Text size="lg" fw="bold">{t`Include diagnostic information`}</Text>- <Text color="text-medium" w="80%">+ <Text color="text-secondary" w="80%">{/* eslint-disable-next-line no-literal-metabase-strings -- this is a translation context string, not shown to users */}{c("{0} is the name of the application, usually 'Metabase'").t`This information helps ${applicationName} figure out what exactly caused the issue.`}@@ -119,7 +119,7 @@ export const BugReportModal = ({<FormSubmitButtonvariant="outline"label={c("This is a verb, not a noun").t`Download`}- color="text-dark"+ color="text-primary"my="sm"px="lg"radius="md"diff --git a/frontend/src/metabase/common/components/ErrorPages/ErrorDiagnosticModal.tsx b/frontend/src/metabase/common/components/ErrorPages/ErrorDiagnosticModal.tsxindex dc2be0ea1d9..eca558bea04 100644--- a/frontend/src/metabase/common/components/ErrorPages/ErrorDiagnosticModal.tsx+++ b/frontend/src/metabase/common/components/ErrorPages/ErrorDiagnosticModal.tsx@@ -48,7 +48,7 @@ export const ErrorDiagnosticModal = ({return (<Modal opened onClose={onClose}><Stack align="center" justify="center" mb="lg">- <Text w="bold" color="text-medium" mb="sm">+ <Text w="bold" color="text-secondary" mb="sm">{c("loading message indicating that we are gathering debugging information to aid in providing technical support",).t`Gathering diagnostic information...`}@@ -143,7 +143,7 @@ export const ErrorDiagnosticModal = ({<Text ta="center" size="lg" fw="bold">{t`Thank you for your feedback!`}</Text>- <Text ta="center" c="text-medium">+ <Text ta="center" c="text-secondary">{t`Bug report submitted successfully.`}</Text><Button mt="xl" onClick={onClose}>{t`Close`}</Button>diff --git a/frontend/src/metabase/common/components/ErrorPages/ErrorPages.tsx b/frontend/src/metabase/common/components/ErrorPages/ErrorPages.tsxindex 0ac6f94338c..3036af484aa 100644--- a/frontend/src/metabase/common/components/ErrorPages/ErrorPages.tsx+++ b/frontend/src/metabase/common/components/ErrorPages/ErrorPages.tsx@@ -117,11 +117,11 @@ export const SmallGenericError = forwardRef<<ErrorPageRoot bordered={bordered} {...props} ref={ref}><Tooltip label={tooltipMessage}>{isEmbeddingIframe ? (- <Icon name="warning" size={32} c="text-light" />+ <Icon name="warning" size={32} c="text-tertiary" />) : (<Button- leftSection={<Icon name="warning" size={32} c="text-light" />}- color="text-light"+ leftSection={<Icon name="warning" size={32} c="text-tertiary" />}+ color="text-tertiary"onClick={openModal}variant="subtle"/>diff --git a/frontend/src/metabase/common/components/ExportSettingsWidget/ExportSettingsWidget.tsx b/frontend/src/metabase/common/components/ExportSettingsWidget/ExportSettingsWidget.tsxindex 821515e65fa..eeefd413a5d 100644--- a/frontend/src/metabase/common/components/ExportSettingsWidget/ExportSettingsWidget.tsx+++ b/frontend/src/metabase/common/components/ExportSettingsWidget/ExportSettingsWidget.tsx@@ -88,7 +88,7 @@ export const ExportSettingsWidget = ({onChange={onChangeFormat}styles={{root: {- backgroundColor: "var(--mb-color-background-light)",+ backgroundColor: "var(--mb-color-background-secondary)",},}}/>diff --git a/frontend/src/metabase/common/components/ExternalLink/ExternalLink.module.css b/frontend/src/metabase/common/components/ExternalLink/ExternalLink.module.cssindex 9cede9ab9f0..3b5a69842e6 100644--- a/frontend/src/metabase/common/components/ExternalLink/ExternalLink.module.css+++ b/frontend/src/metabase/common/components/ExternalLink/ExternalLink.module.css@@ -1,7 +1,7 @@.ButtonLink {display: inline-flex;background-color: var(--mb-color-brand);- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);align-items: center;font-weight: bold;padding: 0.75rem 1rem;diff --git a/frontend/src/metabase/common/components/FileInput/FileInput.styled.tsx b/frontend/src/metabase/common/components/FileInput/FileInput.styled.tsxindex 88216191cd0..cabdcc68657 100644--- a/frontend/src/metabase/common/components/FileInput/FileInput.styled.tsx+++ b/frontend/src/metabase/common/components/FileInput/FileInput.styled.tsx@@ -10,7 +10,7 @@ interface InputFieldProps {}export const InputField = styled.input<InputFieldProps>`- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);flex: 1 1 auto;font-family: inherit;font-weight: ${(props) => (props.hasValue ? "bold" : "")};@@ -32,7 +32,7 @@ export const InputButton = styled.span`border: 1px solid var(--mb-color-border);border-radius: 6px;box-sizing: border-box;- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);cursor: pointer;display: inline-block;font-family: inherit;diff --git a/frontend/src/metabase/common/components/FormField/FormField.styled.tsx b/frontend/src/metabase/common/components/FormField/FormField.styled.tsxindex 459104ba2f1..d899b8fc6f2 100644--- a/frontend/src/metabase/common/components/FormField/FormField.styled.tsx+++ b/frontend/src/metabase/common/components/FormField/FormField.styled.tsx@@ -31,13 +31,14 @@ interface FieldLabelProps {export const FieldLabel = styled.label<FieldLabelProps>`display: block;- color: ${(props) => (props.hasError ? color("error") : color("text-medium"))};+ color: ${(props) =>+ props.hasError ? color("error") : color("text-secondary")};font-size: 0.77rem;font-weight: 900;`;export const OptionalTag = styled.span`- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);font-size: 0.77rem;font-weight: 900;margin-left: 0.25rem;@@ -60,12 +61,12 @@ export const FieldLabelError = styled.span``;export const FieldDescription = styled.div`- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);margin-bottom: 0.5rem;`;export const FieldInfoIcon = styled(Icon)`- color: var(--mb-color-bg-dark);+ color: var(--mb-color-background-tertiary-inverse);margin-left: 0.5rem;width: 0.75rem;height: 0.75rem;@@ -76,7 +77,7 @@ export const FieldInfoIcon = styled(Icon)``;export const FieldInfoLabel = styled.div`- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);font-size: 0.75rem;margin-left: auto;cursor: default;@@ -97,7 +98,7 @@ export const FieldRoot = styled.div<FieldRootProps>`&:focus-within {${FieldLabel} {- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);}${FieldLabelError} {@@ -110,5 +111,5 @@ export const FieldTitleActions = styled.div`margin-left: auto;font-size: 0.77rem;font-weight: 900;- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);`;diff --git a/frontend/src/metabase/common/components/HelpCard/HelpCard.styled.tsx b/frontend/src/metabase/common/components/HelpCard/HelpCard.styled.tsxindex ec1570cc6fa..5d98097ec3e 100644--- a/frontend/src/metabase/common/components/HelpCard/HelpCard.styled.tsx+++ b/frontend/src/metabase/common/components/HelpCard/HelpCard.styled.tsx@@ -11,7 +11,7 @@ const CardRootMixin = css`padding: 1.5rem;border: 1px solid var(--mb-color-border);border-radius: 0.375rem;- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);box-shadow: 0 1px 6px var(--mb-color-shadow);box-sizing: border-box;`;@@ -30,7 +30,7 @@ export const CardRootLink = styled(ExternalLink)`${CardRootMixin};&:hover {- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);}`;@@ -57,7 +57,7 @@ export const CardIcon = styled(Icon)`export const CardMessage = styled.div`display: block;- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);line-height: 1.25rem;p {diff --git a/frontend/src/metabase/common/components/Input/Input.styled.tsx b/frontend/src/metabase/common/components/Input/Input.styled.tsxindex a7646d7addb..c5c033d035b 100644--- a/frontend/src/metabase/common/components/Input/Input.styled.tsx+++ b/frontend/src/metabase/common/components/Input/Input.styled.tsx@@ -66,7 +66,7 @@ export const InputField = styled.input<InputProps>`background-color: ${(props) =>props.readOnly? "var(--mb-color-background-disabled)"- : "var(--mb-color-background)"};+ : "var(--mb-color-background-primary)"};outline: none;text-align: inherit;@@ -78,7 +78,7 @@ export const InputField = styled.input<InputProps>`&:disabled {cursor: default;- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);}${(props) => focusOutlineStyle(props.colorScheme)};@@ -125,7 +125,7 @@ type InputButtonProps = {const InputButton = styled(IconButtonWrapper)<InputButtonProps>`position: absolute;color: ${(props) =>- color(props.onClick != null ? "text-dark" : "text-light")};+ color(props.onClick != null ? "text-primary" : "text-tertiary")};padding: ${(props) => (props.size === "small" ? "0.5rem" : "0.75rem")};border-radius: 50%;bottom: ${(props) => (props.size === "large" ? "0.125rem" : 0)};@@ -155,7 +155,7 @@ export const InputResetButton = styled(InputButton, {`;export const InputSubtitle = styled.div`- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);position: absolute;top: 1.25em;left: 1.25em;diff --git a/frontend/src/metabase/common/components/ItemsTable/BaseItemsTable.styled.tsx b/frontend/src/metabase/common/components/ItemsTable/BaseItemsTable.styled.tsxindex c96469ae0b6..83c559f7119 100644--- a/frontend/src/metabase/common/components/ItemsTable/BaseItemsTable.styled.tsx+++ b/frontend/src/metabase/common/components/ItemsTable/BaseItemsTable.styled.tsx@@ -33,7 +33,7 @@ export const Table = styled(shouldForwardProp: (prop) => prop !== "isInDragLayer",},)`- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);table-layout: fixed;border-collapse: unset;border-radius: 0.5rem;@@ -74,7 +74,7 @@ export const ColumnHeader = styled.th<ResponsiveProps>`}font-weight: bold;- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);${hideResponsively}`;@@ -140,7 +140,7 @@ export const SortingIcon = styled(`;export const DescriptionIcon = styled(FixedSizeIcon)`- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);`;export const SortingControlContainer = styled.div<{@@ -149,7 +149,7 @@ export const SortingControlContainer = styled.div<{}>`display: flex;align-items: center;- color: ${({ isActive }) => isActive && "var(--mb-color-text-dark)"};+ color: ${({ isActive }) => isActive && "var(--mb-color-text-primary)"};${({ isSortable = true }) =>isSortable ? `cursor: pointer; user-select: none;` : ""}@@ -159,7 +159,7 @@ export const SortingControlContainer = styled.div<{}&:hover {- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);.Icon {visibility: visible;diff --git a/frontend/src/metabase/common/components/ItemsTable/DefaultItemRenderer.tsx b/frontend/src/metabase/common/components/ItemsTable/DefaultItemRenderer.tsxindex 33e10e44dc9..bafe8ec6fc8 100644--- a/frontend/src/metabase/common/components/ItemsTable/DefaultItemRenderer.tsx+++ b/frontend/src/metabase/common/components/ItemsTable/DefaultItemRenderer.tsx@@ -44,7 +44,7 @@ export const DefaultItemRenderer = ({const icon = getIcon(item);if (item.model === "card" || item.archived) {- icon.color = "text-light";+ icon.color = "text-tertiary";}const handleSelectionToggled = useCallback(() => {diff --git a/frontend/src/metabase/common/components/LastEditInfoLabel/LastEditInfoLabel.tsx b/frontend/src/metabase/common/components/LastEditInfoLabel/LastEditInfoLabel.tsxindex 1744b4f7dd1..5f2a794d905 100644--- a/frontend/src/metabase/common/components/LastEditInfoLabel/LastEditInfoLabel.tsx+++ b/frontend/src/metabase/common/components/LastEditInfoLabel/LastEditInfoLabel.tsx@@ -107,7 +107,7 @@ function LastEditInfoLabel({className={className}size="sm"fw="bold"- c="var(--mb-color-text-secondary)"+ c="text-secondary"data-testid="revision-history-text">{children}diff --git a/frontend/src/metabase/common/components/LighthouseIllustration/Lighthouse.module.css b/frontend/src/metabase/common/components/LighthouseIllustration/Lighthouse.module.cssindex a24c0855655..8f199412a9f 100644--- a/frontend/src/metabase/common/components/LighthouseIllustration/Lighthouse.module.css+++ b/frontend/src/metabase/common/components/LighthouseIllustration/Lighthouse.module.css@@ -10,7 +10,7 @@.LighthouseColors {--illustration-primary: var(--mb-color-brand);--illustration-secondary: var(--mb-color-brand-light);- --illustration-background: var(--mb-color-bg-white);+ --illustration-background: var(--mb-color-background-primary);}.LighthouseImage {diff --git a/frontend/src/metabase/common/components/List/List.module.css b/frontend/src/metabase/common/components/List/List.module.cssindex 1d660b52914..c4375c23031 100644--- a/frontend/src/metabase/common/components/List/List.module.css+++ b/frontend/src/metabase/common/components/List/List.module.css@@ -1,7 +1,7 @@:root {- --title-color: var(--mb-color-text-dark);- --subtitle-color: var(--mb-color-text-medium);- --muted-color: var(--mb-color-text-light);+ --title-color: var(--mb-color-text-primary);+ --subtitle-color: var(--mb-color-text-secondary);+ --muted-color: var(--mb-color-text-tertiary);}.list {diff --git a/frontend/src/metabase/common/components/Markdown/Markdown.styled.tsx b/frontend/src/metabase/common/components/Markdown/Markdown.styled.tsxindex acb478a3c78..03cbf976f4d 100644--- a/frontend/src/metabase/common/components/Markdown/Markdown.styled.tsx+++ b/frontend/src/metabase/common/components/Markdown/Markdown.styled.tsx@@ -35,7 +35,7 @@ export const MarkdownRoot = styled(getComponent(ReactMarkdown))<MarkdownProps>`cursor: pointer;text-decoration: none;color: ${(props) =>- props.unstyleLinks ? color("text-white") : color("brand")};+ props.unstyleLinks ? color("text-primary-inverse") : color("brand")};}a:hover {@@ -51,7 +51,9 @@ export const MarkdownRoot = styled(getComponent(ReactMarkdown))<MarkdownProps>`border: none;border-bottom: 1px solid${(props) =>- props.dark ? "var(--mb-color-bg-dark)" : "var(--mb-color-border)"};+ props.dark+ ? "var(--mb-color-background-tertiary-inverse)"+ : "var(--mb-color-border)"};}`;diff --git a/frontend/src/metabase/common/components/MetabotLogo/MetabotLogo.module.css b/frontend/src/metabase/common/components/MetabotLogo/MetabotLogo.module.cssindex ec53470afba..6010f7afa72 100644--- a/frontend/src/metabase/common/components/MetabotLogo/MetabotLogo.module.css+++ b/frontend/src/metabase/common/components/MetabotLogo/MetabotLogo.module.css@@ -7,9 +7,9 @@--metabot-frames: var(--metabot-face);[data-mantine-color-scheme="dark"] & {- --metabot-face: var(--mb-color-bg-light);+ --metabot-face: var(--mb-color-background-secondary);--metabot-face-bg: var(--mb-color-brand);--metabot-buttons-bg: var(--mb-color-brand-light);- --metabot-frames: var(--mb-color-bg-white);+ --metabot-frames: var(--mb-color-background-primary);}}diff --git a/frontend/src/metabase/common/components/MetadataInfo/ColumnInfoIcon/ColumnInfoIcon.tsx b/frontend/src/metabase/common/components/MetadataInfo/ColumnInfoIcon/ColumnInfoIcon.tsxindex 324522f7be6..4406b762095 100644--- a/frontend/src/metabase/common/components/MetadataInfo/ColumnInfoIcon/ColumnInfoIcon.tsx+++ b/frontend/src/metabase/common/components/MetadataInfo/ColumnInfoIcon/ColumnInfoIcon.tsx@@ -1,6 +1,7 @@import { t } from "ttag";import { getColumnIcon } from "metabase/common/utils/columns";+import type { ColorName } from "metabase/lib/colors/types";import type { IconName } from "metabase/ui";import type {@@ -16,12 +17,13 @@ import {PopoverDefaultIcon,PopoverHoverTarget,} from "../InfoIcon";+export { HoverParent };type QueryColumnInfoIconProps = QueryColumnInfoPopoverProps & {size?: number;icon?: IconName;- color?: string;+ color?: ColorName;};export function QueryColumnInfoIcon({@@ -41,7 +43,7 @@ export function QueryColumnInfoIcon({className={className}name={icon ?? getColumnIcon(column)}size={size}- color={color}+ c={color}/><PopoverHoverTarget className={className} name="info" size={size} /></span>@@ -55,7 +57,7 @@ QueryColumnInfoIcon.HoverParent = HoverParent;type TableColumnInfoIconProps = TableColumnInfoPopoverProps & {icon: IconName;size?: number;- color?: string;+ color?: ColorName;};export function TableColumnInfoIcon({@@ -73,7 +75,7 @@ export function TableColumnInfoIcon({className={className}name={icon}size={size}- color={color}+ c={color}/><PopoverHoverTarget className={className} name="info" size={size} /></span>diff --git a/frontend/src/metabase/common/components/MetadataInfo/MetadataInfo.module.css b/frontend/src/metabase/common/components/MetadataInfo/MetadataInfo.module.cssindex c9e8a576ff3..63957339743 100644--- a/frontend/src/metabase/common/components/MetadataInfo/MetadataInfo.module.css+++ b/frontend/src/metabase/common/components/MetadataInfo/MetadataInfo.module.css@@ -6,6 +6,6 @@}.EmptyDescription {- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);font-weight: 700;}diff --git a/frontend/src/metabase/common/components/MetadataInfo/TableInfo/ColumnCount.tsx b/frontend/src/metabase/common/components/MetadataInfo/TableInfo/ColumnCount.tsxindex e4cbf711df8..fce3484b75c 100644--- a/frontend/src/metabase/common/components/MetadataInfo/TableInfo/ColumnCount.tsx+++ b/frontend/src/metabase/common/components/MetadataInfo/TableInfo/ColumnCount.tsx@@ -7,7 +7,7 @@ import { Label, LabelContainer } from "../MetadataInfo.styled";function ColumnCount({ table }: { table: Table }) {const fieldCount = table.numFields();return (- <LabelContainer color="text-dark">+ <LabelContainer color="text-primary"><Label>{ngettext(msgid`${fieldCount} column`,diff --git a/frontend/src/metabase/common/components/MetadataInfo/TableInfo/ConnectedTables.styled.tsx b/frontend/src/metabase/common/components/MetadataInfo/TableInfo/ConnectedTables.styled.tsxindex a343d824ee3..965b926ba97 100644--- a/frontend/src/metabase/common/components/MetadataInfo/TableInfo/ConnectedTables.styled.tsx+++ b/frontend/src/metabase/common/components/MetadataInfo/TableInfo/ConnectedTables.styled.tsx@@ -6,7 +6,7 @@ import Link from "metabase/common/components/Link";import TableLabel from "../TableLabel/TableLabel";export const InteractiveTableLabel = styled(TableLabel)`- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);`;export const LabelButton = styled.button`diff --git a/frontend/src/metabase/common/components/MetadataInfo/TableInfo/ConnectedTables.tsx b/frontend/src/metabase/common/components/MetadataInfo/TableInfo/ConnectedTables.tsxindex da63fdffcc4..46ec27237a0 100644--- a/frontend/src/metabase/common/components/MetadataInfo/TableInfo/ConnectedTables.tsx+++ b/frontend/src/metabase/common/components/MetadataInfo/TableInfo/ConnectedTables.tsx@@ -21,7 +21,7 @@ function ConnectedTables({ table, onConnectedTableClick }: Props) {return fkTables.length ? (<Container>- <LabelContainer color="text-dark">+ <LabelContainer color="text-primary"><Label>{t`Connected to these tables`}</Label></LabelContainer>{fkTables.slice(0, 8).map((fkTable) => {diff --git a/frontend/src/metabase/common/components/ModalContent/ModalContent.stories.tsx b/frontend/src/metabase/common/components/ModalContent/ModalContent.stories.tsxindex a53f07ef7bf..3bef7ce7cdb 100644--- a/frontend/src/metabase/common/components/ModalContent/ModalContent.stories.tsx+++ b/frontend/src/metabase/common/components/ModalContent/ModalContent.stories.tsx@@ -32,7 +32,7 @@ const Template: StoryFn<ModalContentProps> = (args) => {<divstyle={{width: 1200,- background: color("bg-white"),+ background: color("background-primary"),border: "1px solid black",}}>diff --git a/frontend/src/metabase/common/components/ModalContent/ModalContent.styled.ts b/frontend/src/metabase/common/components/ModalContent/ModalContent.styled.tsindex 352d20a8a1c..19d6b008cca 100644--- a/frontend/src/metabase/common/components/ModalContent/ModalContent.styled.ts+++ b/frontend/src/metabase/common/components/ModalContent/ModalContent.styled.ts@@ -10,11 +10,11 @@ export const ActionsWrapper = styled.div``;export const ModalContentActionIcon = styled(Icon)`- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);cursor: pointer;&:hover {- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);}`;diff --git a/frontend/src/metabase/common/components/ModalContent/ModalHeader.module.css b/frontend/src/metabase/common/components/ModalContent/ModalHeader.module.cssindex 379468c0bb8..f3cd600a1ab 100644--- a/frontend/src/metabase/common/components/ModalContent/ModalHeader.module.css+++ b/frontend/src/metabase/common/components/ModalContent/ModalHeader.module.css@@ -3,7 +3,7 @@flex-grow: 1;display: flex;align-items: center;- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);&.HeaderTextCentered {justify-content: center;diff --git a/frontend/src/metabase/common/components/MoveQuestionsIntoDashboardsModal/ConfirmMoveDashboardQuestionCandidatesModal.module.css b/frontend/src/metabase/common/components/MoveQuestionsIntoDashboardsModal/ConfirmMoveDashboardQuestionCandidatesModal.module.cssindex b7174c66389..5cd8de14228 100644--- a/frontend/src/metabase/common/components/MoveQuestionsIntoDashboardsModal/ConfirmMoveDashboardQuestionCandidatesModal.module.css+++ b/frontend/src/metabase/common/components/MoveQuestionsIntoDashboardsModal/ConfirmMoveDashboardQuestionCandidatesModal.module.css@@ -28,7 +28,7 @@}.tbody {- background: var(--mb-color-bg-light);+ background: var(--mb-color-background-secondary);overflow-y: auto;/* magic numbers:* 90dvh as modal has 5dvh padding on top/bottomdiff --git a/frontend/src/metabase/common/components/MoveQuestionsIntoDashboardsModal/ConfirmMoveDashboardQuestionCandidatesModal.tsx b/frontend/src/metabase/common/components/MoveQuestionsIntoDashboardsModal/ConfirmMoveDashboardQuestionCandidatesModal.tsxindex 73b9a470f29..37725bd0225 100644--- a/frontend/src/metabase/common/components/MoveQuestionsIntoDashboardsModal/ConfirmMoveDashboardQuestionCandidatesModal.tsx+++ b/frontend/src/metabase/common/components/MoveQuestionsIntoDashboardsModal/ConfirmMoveDashboardQuestionCandidatesModal.tsx@@ -112,7 +112,7 @@ export const ConfirmMoveDashboardQuestionCandidatesModal = ({}).with({ rows: [] }, () => (<Flex justify="center" py="19rem">- <Text size="1.25rem" px="md" color="text-light">+ <Text size="1.25rem" px="md" color="text-tertiary">{t`There aren't any questions to move into dashboards. Looks like everything is in its place.`}</Text></Flex>diff --git a/frontend/src/metabase/common/components/PaginationControls/PaginationControls.tsx b/frontend/src/metabase/common/components/PaginationControls/PaginationControls.tsxindex 0786f79b89d..5b7858cf5c3 100644--- a/frontend/src/metabase/common/components/PaginationControls/PaginationControls.tsx+++ b/frontend/src/metabase/common/components/PaginationControls/PaginationControls.tsx@@ -48,7 +48,7 @@ export const PaginationControls = ({{page * pageSize + 1} - {page * pageSize + itemsLength}{showTotal && (<>- <Text component="span" c="text-light">+ <Text component="span" c="text-tertiary"> {c("Appears in phrases like '1-10 of 100', referring to a page of results",diff --git a/frontend/src/metabase/common/components/PasswordReveal/PasswordReveal.jsx b/frontend/src/metabase/common/components/PasswordReveal/PasswordReveal.jsxindex 8418174313a..a3f7744070c 100644--- a/frontend/src/metabase/common/components/PasswordReveal/PasswordReveal.jsx+++ b/frontend/src/metabase/common/components/PasswordReveal/PasswordReveal.jsx@@ -13,7 +13,7 @@ const styles = {input: {fontSize: "1.2rem",letterSpacing: "2",- color: color("text-dark"),+ color: color("text-primary"),outline: "none",},};diff --git a/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerItemList.tsx b/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerItemList.tsxindex e527ff03c87..efe8f7192c7 100644--- a/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerItemList.tsx+++ b/frontend/src/metabase/common/components/Pickers/MiniPicker/components/MiniPickerItemList.tsx@@ -312,7 +312,7 @@ function SearchItemList({ query }: { query: string }) {<Box>{isLoading && <MiniPickerListLoader />}{!isLoading && searchResults.length === 0 && (- <Text px="md" py="sm" c="text-medium">{t`No search results`}</Text>+ <Text px="md" py="sm" c="text-secondary">{t`No search results`}</Text>)}</Box>{searchResults.map((item) => {@@ -375,7 +375,7 @@ const LocationInfo = ({ item }: { item: MiniPickerPickableItem }) => {return (<Flex gap="xs" align="center">{iconProps && <Icon {...iconProps} size={12} />}- <Text size="sm" c="text-medium">+ <Text size="sm" c="text-secondary"><Ellipsified maw="18rem">{itemText}</Ellipsified></Text></Flex>diff --git a/frontend/src/metabase/common/components/Popover/Popover.module.css b/frontend/src/metabase/common/components/Popover/Popover.module.cssindex a9c2423e1ff..01ec29774b5 100644--- a/frontend/src/metabase/common/components/Popover/Popover.module.css+++ b/frontend/src/metabase/common/components/Popover/Popover.module.css@@ -17,7 +17,7 @@.PopoverBody.PopoverBodyWithBackground {border: 1px solid var(--mb-color-border);box-shadow: 0 4px 10px var(--mb-color-shadow);- background-color: var(--mb-color-background);+ background-color: var(--mb-color-background-primary);border-radius: 6px;overflow: auto;}@@ -57,7 +57,7 @@font-size: inherit;border: 1px solid var(--mb-color-border);box-shadow: 0 4px 10px var(--mb-color-shadow);- background-color: var(--mb-color-background);+ background-color: var(--mb-color-background-primary);border-radius: 6px;overflow: auto;}@@ -123,7 +123,7 @@/* create a smaller inset arrow on the top */:global(.tether-element-attached-top) .PopoverBodyWithArrow::after {top: -18px;- border-bottom-color: var(--mb-color-bg-white);+ border-bottom-color: var(--mb-color-background-primary);}/* create a slightly larger arrow on the bottom for border purposes */@@ -135,7 +135,7 @@/* create a smaller inset arrow on the bottom */:global(.tether-element-attached-bottom) .PopoverBodyWithArrow::after {bottom: -18px;- border-top-color: var(--mb-color-bg-white);+ border-top-color: var(--mb-color-background-primary);}/* if the tether element is attached right, move our arrows right */diff --git a/frontend/src/metabase/common/components/QueryColumnPicker/BucketPickerPopover/BaseBucketPickerPopover.module.css b/frontend/src/metabase/common/components/QueryColumnPicker/BucketPickerPopover/BaseBucketPickerPopover.module.cssindex 8fab001ddd7..6d43333ee13 100644--- a/frontend/src/metabase/common/components/QueryColumnPicker/BucketPickerPopover/BaseBucketPickerPopover.module.css+++ b/frontend/src/metabase/common/components/QueryColumnPicker/BucketPickerPopover/BaseBucketPickerPopover.module.css@@ -2,7 +2,11 @@border-radius: 0;/** we hide the trigger button by default, and show it on hover */visibility: hidden;- color: color-mix(in srgb, var(--mb-color-text-white), transparent 40%);+ color: color-mix(+ in srgb,+ var(--mb-color-text-primary-inverse),+ transparent 40%+ );border-left: 2px solidcolor-mix(in srgb, var(--mb-color-border), transparent 80%);}diff --git a/frontend/src/metabase/common/components/QueryColumnPicker/BucketPickerPopover/BaseBucketPickerPopover.styled.tsx b/frontend/src/metabase/common/components/QueryColumnPicker/BucketPickerPopover/BaseBucketPickerPopover.styled.tsxindex aa1a807c58a..ad8216b61bb 100644--- a/frontend/src/metabase/common/components/QueryColumnPicker/BucketPickerPopover/BaseBucketPickerPopover.styled.tsx+++ b/frontend/src/metabase/common/components/QueryColumnPicker/BucketPickerPopover/BaseBucketPickerPopover.styled.tsx@@ -7,7 +7,7 @@ import { Button, type ButtonProps, Icon } from "metabase/ui";import { color } from "metabase/ui/utils/colors";export const TriggerIcon = styled(Icon)`- color: var(--mb-color-text-white) !important;+ color: var(--mb-color-text-primary-inverse) !important;flex: 0 0 auto;`;diff --git a/frontend/src/metabase/common/components/Radio/Radio.styled.tsx b/frontend/src/metabase/common/components/Radio/Radio.styled.tsxindex bc6c8c7ebf8..b44263bfa4b 100644--- a/frontend/src/metabase/common/components/Radio/Radio.styled.tsx+++ b/frontend/src/metabase/common/components/Radio/Radio.styled.tsx@@ -100,7 +100,7 @@ export const RadioContainerBubble = styled(RadioContainer)`font-weight: bold;color: ${(props) =>props.checked- ? color("text-white")+ ? color("text-primary-inverse"): getContrastSchemeColor(props.colorScheme)};background-color: ${(props) =>props.checked@@ -133,7 +133,9 @@ export const RadioButton = styled.span<RadioButtonProps>`border-radius: 0.75rem;box-shadow: 0 0 0 2px${(props) =>- props.checked ? getSchemeColor(props.colorScheme) : color("text-medium")};+ props.checked+ ? getSchemeColor(props.colorScheme)+ : color("text-secondary")};background-color: ${(props) =>props.checked ? getSchemeColor(props.colorScheme) : "transparent"};`;diff --git a/frontend/src/metabase/common/components/ReorderableTagsInput/ReorderableTagsInput.module.css b/frontend/src/metabase/common/components/ReorderableTagsInput/ReorderableTagsInput.module.cssindex a115f12664c..8e330525d95 100644--- a/frontend/src/metabase/common/components/ReorderableTagsInput/ReorderableTagsInput.module.css+++ b/frontend/src/metabase/common/components/ReorderableTagsInput/ReorderableTagsInput.module.css@@ -24,7 +24,7 @@flex: 0 0 auto;padding-inline: 0.5rem;height: 100%;- background: var(--mb-color-bg-white);+ background: var(--mb-color-background-primary);border: 1px solid var(--mb-color-border);border-radius: var(--mantine-radius-xl);cursor: pointer;diff --git a/frontend/src/metabase/common/components/ReorderableTagsInput/ReorderableTagsInput.stories.tsx b/frontend/src/metabase/common/components/ReorderableTagsInput/ReorderableTagsInput.stories.tsxindex ab13b3d81d2..6db86e27f39 100644--- a/frontend/src/metabase/common/components/ReorderableTagsInput/ReorderableTagsInput.stories.tsx+++ b/frontend/src/metabase/common/components/ReorderableTagsInput/ReorderableTagsInput.stories.tsx@@ -250,7 +250,7 @@ export const DragBetweenTwoInputs = {/></Box><Divider />- <Text size="sm" c="text-medium">+ <Text size="sm" c="text-secondary">Tip: start dragging a tag to reorder within an input or move itbetween inputs.</Text>diff --git a/frontend/src/metabase/common/components/SaveQuestionForm/SaveQuestionForm.tsx b/frontend/src/metabase/common/components/SaveQuestionForm/SaveQuestionForm.tsxindex 3f42c74b0e7..2d73e28e6fc 100644--- a/frontend/src/metabase/common/components/SaveQuestionForm/SaveQuestionForm.tsx+++ b/frontend/src/metabase/common/components/SaveQuestionForm/SaveQuestionForm.tsx@@ -23,7 +23,7 @@ import { useSaveQuestionContext } from "./context";const labelStyles = {fontWeight: 900,fontSize: "0.77rem",- color: "var(--mb-color-text-medium)",+ color: "var(--mb-color-text-secondary)",marginBottom: rem("7px"),};@@ -71,7 +71,7 @@ export const SaveQuestionForm = ({label: {fontWeight: 900,fontSize: "0.77rem",- color: "var(--mb-color-text-medium)",+ color: "var(--mb-color-text-secondary)",marginBottom: rem("7px"),},}}diff --git a/frontend/src/metabase/common/components/SchedulePicker/SchedulePicker.styled.tsx b/frontend/src/metabase/common/components/SchedulePicker/SchedulePicker.styled.tsxindex 7e81acf70bc..bc2c4c79690 100644--- a/frontend/src/metabase/common/components/SchedulePicker/SchedulePicker.styled.tsx+++ b/frontend/src/metabase/common/components/SchedulePicker/SchedulePicker.styled.tsx@@ -20,5 +20,5 @@ export const PickerText = styled.span`export const ScheduleDescriptionContainer = styled.div`margin-top: 1rem;- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);`;diff --git a/frontend/src/metabase/common/components/SegmentedControl/SegmentedControl.styled.tsx b/frontend/src/metabase/common/components/SegmentedControl/SegmentedControl.styled.tsxindex e23a517ada4..c110b9b769a 100644--- a/frontend/src/metabase/common/components/SegmentedControl/SegmentedControl.styled.tsx+++ b/frontend/src/metabase/common/components/SegmentedControl/SegmentedControl.styled.tsx@@ -32,7 +32,7 @@ const COLORS = {isSelected ? color(selectedColor) : "transparent",border: ({ selectedColor }: ColorProps) => color(selectedColor),text: ({ isSelected, inactiveColor }: ColorProps) =>- color(isSelected ? "text-white" : inactiveColor),+ color(isSelected ? "text-primary-inverse" : inactiveColor),},"fill-all": {background: ({ isSelected, selectedColor }: ColorProps) =>diff --git a/frontend/src/metabase/common/components/SegmentedControl/SegmentedControl.tsx b/frontend/src/metabase/common/components/SegmentedControl/SegmentedControl.tsxindex 855cfe40db8..d7a2950654c 100644--- a/frontend/src/metabase/common/components/SegmentedControl/SegmentedControl.tsx+++ b/frontend/src/metabase/common/components/SegmentedControl/SegmentedControl.tsx@@ -44,7 +44,7 @@ export function SegmentedControl<Value extends SegmentedControlValue = number>({options,onChange,fullWidth = false,- inactiveColor = "text-dark",+ inactiveColor = "text-primary",variant = "fill-background",...props}: SegmentedControlProps<Value>) {diff --git a/frontend/src/metabase/common/components/Select/Select.tsx b/frontend/src/metabase/common/components/Select/Select.tsxindex 61a94905c2e..4da92dbc0a4 100644--- a/frontend/src/metabase/common/components/Select/Select.tsx+++ b/frontend/src/metabase/common/components/Select/Select.tsx@@ -208,7 +208,7 @@ class BaseSelect<<Iconname={icon}size={(item as any).iconSize || 16}- c={(item as any).iconColor || "text-dark"}+ c={(item as any).iconColor || "text-primary"}style={{ minWidth: MIN_ICON_WIDTH }}/>);@@ -216,7 +216,11 @@ class BaseSelect<if (this.itemIsSelected(item)) {return (- <Icon name="check" c="text-dark" style={{ minWidth: MIN_ICON_WIDTH }} />+ <Icon+ name="check"+ c="text-primary"+ style={{ minWidth: MIN_ICON_WIDTH }}+ />);}diff --git a/frontend/src/metabase/common/components/SelectButton/SelectButton.styled.tsx b/frontend/src/metabase/common/components/SelectButton/SelectButton.styled.tsxindex 0ef6a1dca2e..97212612505 100644--- a/frontend/src/metabase/common/components/SelectButton/SelectButton.styled.tsx+++ b/frontend/src/metabase/common/components/SelectButton/SelectButton.styled.tsx@@ -13,9 +13,9 @@ interface SelectButtonRootProps {const getColor = ({ hasValue, highlighted }: SelectButtonRootProps) => {if (hasValue) {- return highlighted ? color("text-white") : color("text-dark");+ return highlighted ? color("text-primary-inverse") : color("text-primary");} else {- return color("text-light");+ return color("text-tertiary");}};@@ -29,7 +29,7 @@ export const SelectButtonRoot = styled.button<SelectButtonRootProps>`${({ hasValue, highlighted }) =>hasValue && highlighted ? color("brand") : color("border")};background-color: ${({ hasValue, highlighted }) =>- hasValue && highlighted ? color("brand") : color("bg-white")};+ hasValue && highlighted ? color("brand") : color("background-primary")};border-radius: var(--mantine-spacing-sm);font-weight: 700;min-width: 104px;@@ -46,8 +46,8 @@ export const SelectButtonRoot = styled.button<SelectButtonRootProps>`}&:disabled {- background-color: var(--mb-color-bg-light);- color: var(--mb-color-text-medium);+ background-color: var(--mb-color-background-secondary);+ color: var(--mb-color-text-secondary);pointer-events: none;}`;@@ -69,7 +69,9 @@ export const SelectButtonIcon = styled(display: flex;margin-left: auto;color: ${({ hasValue, highlighted }) =>- hasValue && highlighted ? color("text-white") : color("text-medium")};+ hasValue && highlighted+ ? color("text-primary-inverse")+ : color("text-secondary")};`;export const SelectButtonContent = styled.span`diff --git a/frontend/src/metabase/common/components/SelectList/SelectListItem.styled.tsx b/frontend/src/metabase/common/components/SelectList/SelectListItem.styled.tsxindex c467e6e96d4..28a86eb93c0 100644--- a/frontend/src/metabase/common/components/SelectList/SelectListItem.styled.tsx+++ b/frontend/src/metabase/common/components/SelectList/SelectListItem.styled.tsx@@ -3,17 +3,14 @@ import { css } from "@emotion/react";// eslint-disable-next-line no-restricted-importsimport styled from "@emotion/styled";-import type { ColorName } from "metabase/lib/colors/types";import { Icon, Text, type TextProps } from "metabase/ui";-import { maybeColor } from "metabase/ui/utils/colors";export const ItemTitle = styled(Text)<TextProps>`margin: 0;word-break: break-word;` as unknown as typeof Text;-export const ItemIcon = styled(Icon)<{ color?: ColorName | string | null }>`- color: ${(props) => maybeColor(props.color ?? "text-light")};+export const ItemIcon = styled(Icon)`justify-self: end;`;@@ -22,7 +19,7 @@ const activeItemCss = css`${ItemIcon},${ItemTitle} {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);}`;diff --git a/frontend/src/metabase/common/components/SelectList/SelectListItem.tsx b/frontend/src/metabase/common/components/SelectList/SelectListItem.tsxindex abcc8f42c66..71b8f307ae7 100644--- a/frontend/src/metabase/common/components/SelectList/SelectListItem.tsx+++ b/frontend/src/metabase/common/components/SelectList/SelectListItem.tsx@@ -47,7 +47,7 @@ export function SelectListItem({hasRightIcon={!!rightIcon}>{icon && (- <ItemIcon className={classNames.icon} color="brand" {...iconProps} />+ <ItemIcon className={classNames.icon} c="brand" {...iconProps} />)}<ItemTitleclassName={classNames.label}diff --git a/frontend/src/metabase/common/components/Sidebar.module.css b/frontend/src/metabase/common/components/Sidebar.module.cssindex f1b89afe8a8..74261c14dd3 100644--- a/frontend/src/metabase/common/components/Sidebar.module.css+++ b/frontend/src/metabase/common/components/Sidebar.module.css@@ -3,8 +3,8 @@composes: py2 from "style";width: 30%;max-width: 500px;- background-color: var(--mb-color-bg-light);- color: var(--mb-color-text-medium);+ background-color: var(--mb-color-background-secondary);+ color: var(--mb-color-text-secondary);}.sidebar a {@@ -16,7 +16,7 @@align-items: center;display: flex;font-size: 1em;- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);}.item .icon {@@ -24,7 +24,7 @@}.item:hover {- background-color: var(--mb-color-bg-medium);+ background-color: var(--mb-color-background-tertiary);color: var(--mb-color-brand);}@@ -39,7 +39,7 @@.name {composes: ml2 textBold from "style";- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);text-overflow: ellipsis;white-space: nowrap;overflow-x: hidden;diff --git a/frontend/src/metabase/common/components/Sidesheet/Sidesheet.tsx b/frontend/src/metabase/common/components/Sidesheet/Sidesheet.tsxindex 0a2094f31d3..77c89519b7c 100644--- a/frontend/src/metabase/common/components/Sidesheet/Sidesheet.tsx+++ b/frontend/src/metabase/common/components/Sidesheet/Sidesheet.tsx@@ -60,14 +60,14 @@ export function Sidesheet({transitionProps={{ duration: 0 }}px="none"w={sizes[size]}- bg="bg-light"+ bg="background-secondary"data-testid="sidesheet"classNames={{content: cx(Styles.SidesheetContent, Animation.slideLeft),}}aria-labelledby={titleId}>- <Modal.Header bg="bg-light" px="xl">+ <Modal.Header bg="background-secondary" px="xl">{title && (<Modal.Title py="md" pr="sm" id={titleId}>{title}diff --git a/frontend/src/metabase/common/components/Sidesheet/SidesheetButton.tsx b/frontend/src/metabase/common/components/Sidesheet/SidesheetButton.tsxindex 1a533ed072a..dc36dd52355 100644--- a/frontend/src/metabase/common/components/Sidesheet/SidesheetButton.tsx+++ b/frontend/src/metabase/common/components/Sidesheet/SidesheetButton.tsx@@ -14,7 +14,7 @@ export const SidesheetButtonWithChevron = ({><Flex justify="space-between" gap="sm">{children}- <Icon name="chevronright" color="var(--mb-color-text-dark)" />+ <Icon name="chevronright" c="text-primary" /></Flex></SidesheetButton>);diff --git a/frontend/src/metabase/common/components/Sidesheet/SidesheetCard.tsx b/frontend/src/metabase/common/components/Sidesheet/SidesheetCard.tsxindex 436d54b7a9c..5d90466d895 100644--- a/frontend/src/metabase/common/components/Sidesheet/SidesheetCard.tsx+++ b/frontend/src/metabase/common/components/Sidesheet/SidesheetCard.tsx@@ -41,5 +41,5 @@ export const SidesheetCard = ({};export const SidesheetCardTitle = (props: TitleProps) => (- <Title mb="sm" c="text-medium" order={4} {...props} />+ <Title mb="sm" c="text-secondary" order={4} {...props} />);diff --git a/frontend/src/metabase/common/components/Sidesheet/SidesheetCardSection.tsx b/frontend/src/metabase/common/components/Sidesheet/SidesheetCardSection.tsxindex 2abbaeefe6b..6651714019a 100644--- a/frontend/src/metabase/common/components/Sidesheet/SidesheetCardSection.tsx+++ b/frontend/src/metabase/common/components/Sidesheet/SidesheetCardSection.tsx@@ -17,7 +17,7 @@ export const SidesheetCardSection = ({return (<Box {...styleProps}>{title && (- <Title mb="sm" c="text-medium" order={4}>+ <Title mb="sm" c="text-secondary" order={4}>{title}</Title>)}diff --git a/frontend/src/metabase/common/components/Sidesheet/sidesheet.module.css b/frontend/src/metabase/common/components/Sidesheet/sidesheet.module.cssindex 7a228aa3efa..1d9f93ee72b 100644--- a/frontend/src/metabase/common/components/Sidesheet/sidesheet.module.css+++ b/frontend/src/metabase/common/components/Sidesheet/sidesheet.module.css@@ -35,7 +35,7 @@/* For divs that are not tabs but which sit next to the tabs */.TabSibling {padding: 0.6875rem 0.5rem;- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);font-weight: bold;line-height: 1rem;diff --git a/frontend/src/metabase/common/components/Tab/Tab.styled.tsx b/frontend/src/metabase/common/components/Tab/Tab.styled.tsxindex 48bb5114fef..7e4bef19e8d 100644--- a/frontend/src/metabase/common/components/Tab/Tab.styled.tsx+++ b/frontend/src/metabase/common/components/Tab/Tab.styled.tsx@@ -16,7 +16,8 @@ export const TabRoot = styled.button<TabProps>`width: 100%;flex: 1;text-align: left;- color: ${(props) => (props.isSelected ? color("brand") : color("text-dark"))};+ color: ${(props) =>+ props.isSelected ? color("brand") : color("text-primary")};background-color: ${(props) =>props.isSelected ? alpha("brand", 0.1) : "transparent"};cursor: pointer;diff --git a/frontend/src/metabase/common/components/TabButton/TabButton.styled.tsx b/frontend/src/metabase/common/components/TabButton/TabButton.styled.tsxindex 637da78139b..48922e58261 100644--- a/frontend/src/metabase/common/components/TabButton/TabButton.styled.tsx+++ b/frontend/src/metabase/common/components/TabButton/TabButton.styled.tsx@@ -101,17 +101,17 @@ export const MenuButton = styled(Button)<TabButtonProps & { isOpen: boolean }>`!props.disabled &&css`color: var(--mb-color-brand);- background-color: var(--mb-color-bg-medium);+ background-color: var(--mb-color-background-tertiary);`}&:hover,:focus {${(props) =>props.disabled? css`- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);`: css`color: var(--mb-color-brand);- background-color: var(--mb-color-bg-medium);+ background-color: var(--mb-color-background-tertiary);`}}`;@@ -124,7 +124,7 @@ export const MenuItem = styled.li`width: 100%;padding: 0.85em 1.45em;border-radius: 0.5em;- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);font-weight: 700;text-align: start;text-decoration: none;@@ -133,6 +133,6 @@ export const MenuItem = styled.li`&:focus,:hover {color: var(--mb-color-brand);- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);}`;diff --git a/frontend/src/metabase/common/components/TabRow/TabRow.styled.tsx b/frontend/src/metabase/common/components/TabRow/TabRow.styled.tsxindex 9147aaec02f..3f868cb92b6 100644--- a/frontend/src/metabase/common/components/TabRow/TabRow.styled.tsx+++ b/frontend/src/metabase/common/components/TabRow/TabRow.styled.tsx@@ -32,7 +32,7 @@ export const ScrollButton = styled.button<ScrollButtonProps>`top: 0;width: 3rem;text-align: ${(props) => props.direction};- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);&:hover {color: var(--mb-color-brand);@@ -41,9 +41,9 @@ export const ScrollButton = styled.button<ScrollButtonProps>`background: linear-gradient(to ${(props) => props.direction},- ${() => alpha("bg-white", 0.1)},- ${() => alpha("bg-white", 0.5)},+ ${() => alpha("background-primary", 0.1)},+ ${() => alpha("background-primary", 0.5)},30%,- var(--mb-color-bg-white)+ var(--mb-color-background-primary));`;diff --git a/frontend/src/metabase/common/components/TabRow/TabRow.tsx b/frontend/src/metabase/common/components/TabRow/TabRow.tsxindex d537e877e2f..8b48f222737 100644--- a/frontend/src/metabase/common/components/TabRow/TabRow.tsx+++ b/frontend/src/metabase/common/components/TabRow/TabRow.tsx@@ -162,7 +162,7 @@ export function ScrollArrow({ direction, onClick }: ScrollArrowProps) {direction={direction}aria-label={`scroll tabs ${direction}`}>- <Icon name={`chevron${direction}`} color="brand" />+ <Icon name={`chevron${direction}`} /></ScrollButton>);}diff --git a/frontend/src/metabase/common/components/Table/Table.tsx b/frontend/src/metabase/common/components/Table/Table.tsxindex b07a83c2f9d..a9389c0a3cd 100644--- a/frontend/src/metabase/common/components/Table/Table.tsx+++ b/frontend/src/metabase/common/components/Table/Table.tsx@@ -152,7 +152,7 @@ function ColumnHeader({name={sortDirection === SortDirection.Asc ? "chevronup" : "chevrondown"}- color="var(--mb-color-text-medium)"+ c="text-secondary"style={{ flexShrink: 0 }}size={8}/>diff --git a/frontend/src/metabase/common/components/TextArea/TextArea.styled.tsx b/frontend/src/metabase/common/components/TextArea/TextArea.styled.tsxindex 7dfe319aa8d..ca987adb377 100644--- a/frontend/src/metabase/common/components/TextArea/TextArea.styled.tsx+++ b/frontend/src/metabase/common/components/TextArea/TextArea.styled.tsx@@ -15,12 +15,14 @@ export const TextAreaRoot = styled.textarea<TextAreaRootProps>`font-family: inherit;font-weight: 700;font-size: 1rem;- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);padding: 0.75rem;border: 1px solid var(--mb-color-border);border-radius: 0.5rem;background-color: ${(props) =>- props.readOnly ? "var(--mb-color-bg-light)" : "var(--mb-color-bg-white)"};+ props.readOnly+ ? "var(--mb-color-background-secondary)"+ : "var(--mb-color-background-primary)"};outline: none;text-align: inherit;diff --git a/frontend/src/metabase/common/components/Timeline/Timeline.styled.tsx b/frontend/src/metabase/common/components/Timeline/Timeline.styled.tsxindex b7842c6e2f1..fe5ef366f30 100644--- a/frontend/src/metabase/common/components/Timeline/Timeline.styled.tsx+++ b/frontend/src/metabase/common/components/Timeline/Timeline.styled.tsx@@ -39,7 +39,7 @@ export const EventHeader = styled.div``;export const Timestamp = styled.time`- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);font-size: 0.875em;padding-bottom: 0.5rem;`;diff --git a/frontend/src/metabase/common/components/Timeline/Timeline.tsx b/frontend/src/metabase/common/components/Timeline/Timeline.tsxindex 2ac212299b8..dc352ff27d2 100644--- a/frontend/src/metabase/common/components/Timeline/Timeline.tsx+++ b/frontend/src/metabase/common/components/Timeline/Timeline.tsx@@ -86,5 +86,5 @@ function EventIcon({ icon }: { icon: RevisionOrModerationEvent["icon"] }) {if (_.isObject(icon)) {return <Icon name={icon.name} c={icon.color} size={16} />;}- return <Icon name={icon} c="text-light" size={16} />;+ return <Icon name={icon} c="text-tertiary" size={16} />;}diff --git a/frontend/src/metabase/common/components/Toaster/Toaster.styled.tsx b/frontend/src/metabase/common/components/Toaster/Toaster.styled.tsxindex 240a5a2afb3..ae34a265bf3 100644--- a/frontend/src/metabase/common/components/Toaster/Toaster.styled.tsx+++ b/frontend/src/metabase/common/components/Toaster/Toaster.styled.tsx@@ -15,7 +15,7 @@ export const ToasterContainer = styled.div<ToasterContainerProps>`min-width: 300px;max-width: 500px;width: fit-content;- background-color: var(--mb-color-text-dark);+ background-color: var(--mb-color-text-primary);padding: 16px;border-radius: 6px;${(props) =>@@ -32,7 +32,7 @@ export const ToasterContainer = styled.div<ToasterContainerProps>``;export const ToasterMessage = styled.p`- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);min-width: 150px;max-width: 320px;flex: 1;@@ -44,9 +44,9 @@ export const ToasterMessage = styled.p`export const ToasterButton = styled.button`display: flex;padding: 7px 18px;- background-color: ${() => alpha("bg-white", 0.1)};+ background-color: ${() => alpha("background-primary", 0.1)};border-radius: 6px;- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);height: fit-content;font-size: 14px;font-weight: bold;@@ -56,16 +56,16 @@ export const ToasterButton = styled.button`&:hover {cursor: pointer;- background-color: ${() => alpha("bg-white", 0.3)};+ background-color: ${() => alpha("background-primary", 0.3)};}`;export const ToasterDismiss = styled.button`cursor: pointer;transition: color 200ms ease;- color: var(--mb-color-bg-dark);+ color: var(--mb-color-background-tertiary-inverse);&:hover {- color: ${() => lighten("bg-dark", 0.3)};+ color: ${() => lighten("background-tertiary-inverse", 0.3)};}`;diff --git a/frontend/src/metabase/common/components/Toggle/Toggle.styled.tsx b/frontend/src/metabase/common/components/Toggle/Toggle.styled.tsxindex bb1c5ef4080..12d00da45d7 100644--- a/frontend/src/metabase/common/components/Toggle/Toggle.styled.tsx+++ b/frontend/src/metabase/common/components/Toggle/Toggle.styled.tsx@@ -27,7 +27,7 @@ const getBackgroundColor = ({if (checked) {return currentColor ?? color("brand");} else {- return "var(--mb-color-bg-medium)";+ return "var(--mb-color-background-tertiary)";}};@@ -48,7 +48,7 @@ export const ToggleRoot = styled.input<ToggleRootProps>`&[disabled] {cursor: not-allowed;opacity: 0.5;- background-color: var(--mb-color-bg-medium);+ background-color: var(--mb-color-background-tertiary);}&:after {@@ -59,7 +59,7 @@ export const ToggleRoot = styled.input<ToggleRootProps>`position: absolute;top: 1px;transform: translateX(${getTranslateX});- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);transition: transform 0.3s;box-shadow: 2px 2px 6px var(--mb-color-shadow);}diff --git a/frontend/src/metabase/common/components/TokenField/TokenField.module.css b/frontend/src/metabase/common/components/TokenField/TokenField.module.cssindex eb5ed7ebafe..53a201df21a 100644--- a/frontend/src/metabase/common/components/TokenField/TokenField.module.css+++ b/frontend/src/metabase/common/components/TokenField/TokenField.module.css@@ -1,3 +1,3 @@.closeIcon {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);}diff --git a/frontend/src/metabase/common/components/TokenField/TokenField.styled.tsx b/frontend/src/metabase/common/components/TokenField/TokenField.styled.tsxindex fb6b28883fd..23f94b13ac0 100644--- a/frontend/src/metabase/common/components/TokenField/TokenField.styled.tsx+++ b/frontend/src/metabase/common/components/TokenField/TokenField.styled.tsx@@ -32,5 +32,5 @@ export const TokenInputControl = styled.input`export const PrefixContainer = styled.div`display: flex;align-items: center;- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);`;diff --git a/frontend/src/metabase/common/components/TokenFieldItem/TokenFieldItem.styled.ts b/frontend/src/metabase/common/components/TokenFieldItem/TokenFieldItem.styled.tsindex 662675c63df..b19d2c597a4 100644--- a/frontend/src/metabase/common/components/TokenFieldItem/TokenFieldItem.styled.ts+++ b/frontend/src/metabase/common/components/TokenFieldItem/TokenFieldItem.styled.ts@@ -11,7 +11,7 @@ export const TokenFieldItem = styled.li<{height: 46px;border-radius: 0.5rem;color: ${({ isValid }) =>- isValid ? `var(--mb-color-text-white)` : `var(--mb-color-error)`};+ isValid ? `var(--mb-color-text-primary-inverse)` : `var(--mb-color-error)`};background-color: var(--mb-color-brand);`;diff --git a/frontend/src/metabase/common/components/ToolbarButton/ToolbarButton.tsx b/frontend/src/metabase/common/components/ToolbarButton/ToolbarButton.tsxindex 7e05954cd00..ff3b91fc4ee 100644--- a/frontend/src/metabase/common/components/ToolbarButton/ToolbarButton.tsx+++ b/frontend/src/metabase/common/components/ToolbarButton/ToolbarButton.tsx@@ -67,12 +67,7 @@ export const ToolbarButton = forwardRef(function ToolbarButton(disabled={disabled}{...actionIconProps}>- {children ?? (- <Icon- name={icon}- color={isActive ? "var(--mb-color-brand)" : undefined}- />- )}+ {children ?? <Icon name={icon} c={isActive ? "brand" : undefined} />}</ActionIcon>);diff --git a/frontend/src/metabase/common/components/UndoListing.styled.tsx b/frontend/src/metabase/common/components/UndoListing.styled.tsxindex d89f1d22faa..aaf0eeb7a6f 100644--- a/frontend/src/metabase/common/components/UndoListing.styled.tsx+++ b/frontend/src/metabase/common/components/UndoListing.styled.tsx@@ -29,7 +29,7 @@ export const ToastCard = styled(Card)<{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);+ background-color: var(--mb-color-background-primary-inverse);color: var(--mb-color-text-secondary-inverse);${({ noBorder }) =>noBorder &&@@ -66,14 +66,14 @@ export const DefaultText = styled.span`export const UndoButton = styled(Link)`font-weight: bold;- background-color: ${() => alpha("bg-white", 0.1)};+ background-color: ${() => alpha("background-primary", 0.1)};padding: 4px 12px;margin-left: var(--mantine-spacing-sm);border-radius: 8px;white-space: nowrap; /* Prevents button from truncating message */:hover {- background-color: ${() => alpha("bg-white", 0.3)};+ background-color: ${() => alpha("background-primary", 0.3)};}`;diff --git a/frontend/src/metabase/common/components/UndoListing.tsx b/frontend/src/metabase/common/components/UndoListing.tsxindex 4c8c25b7a51..8996c0db0da 100644--- a/frontend/src/metabase/common/components/UndoListing.tsx+++ b/frontend/src/metabase/common/components/UndoListing.tsx@@ -106,7 +106,7 @@ function UndoToast({{undo.showProgress && (<Progresssize="sm"- color={undo.pausedAt ? "bg-dark" : "brand"}+ color={undo.pausedAt ? "background-tertiary-inverse" : "brand"}/* we intentionally break a11y - css animation is smoother */value={100}pos="absolute"@@ -125,7 +125,7 @@ function UndoToast({{undo.icon && (<CardIconname={undo.icon}- color={undo.iconColor ?? "var(--mb-color-text-secondary-inverse)"}+ c={undo.iconColor ?? "text-secondary-inverse"}/>)}{undo.renderChildren ? (@@ -156,10 +156,7 @@ function UndoToast({)}{undo.canDismiss && (<DismissIcon- color={- undo.dismissIconColor ||- "var(--mb-color-text-secondary-inverse)"- }+ color={undo.dismissIconColor || "text-secondary-inverse"}name="close"onClick={onDismiss}/>diff --git a/frontend/src/metabase/common/components/Unsubscribe.styled.tsx b/frontend/src/metabase/common/components/Unsubscribe.styled.tsxindex f9af2aa2f25..16bcb105d80 100644--- a/frontend/src/metabase/common/components/Unsubscribe.styled.tsx+++ b/frontend/src/metabase/common/components/Unsubscribe.styled.tsx@@ -14,7 +14,7 @@ export const LayoutRoot = styled.div`position: relative;display: flex;min-height: 100%;- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);`;export const LayoutBody = styled.div`@@ -41,7 +41,7 @@ export const LayoutCard = styled.div`width: 100%;margin-top: 1.5rem;padding: 2.5rem 1.5rem;- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);box-shadow: 0 1px 15px var(--mb-color-shadow);border-radius: 6px;min-height: 20rem;diff --git a/frontend/src/metabase/common/components/Unsubscribe.tsx b/frontend/src/metabase/common/components/Unsubscribe.tsxindex 2ad2742b494..d99f2d57f54 100644--- a/frontend/src/metabase/common/components/Unsubscribe.tsx+++ b/frontend/src/metabase/common/components/Unsubscribe.tsx@@ -140,7 +140,7 @@ function SuccessfulRequestWrapper({return (<Stack align="center"><CheckmarkIcon name="check" size={30} />- <Text fw={700} c="text-medium" mb="0.75rem" ta="center">+ <Text fw={700} c="text-secondary" mb="0.75rem" ta="center">{text}</Text><Button primary onClick={action}>diff --git a/frontend/src/metabase/common/components/UpsellCard/UpsellCard.module.css b/frontend/src/metabase/common/components/UpsellCard/UpsellCard.module.cssindex 90d8d6c788d..3aff057865e 100644--- a/frontend/src/metabase/common/components/UpsellCard/UpsellCard.module.css+++ b/frontend/src/metabase/common/components/UpsellCard/UpsellCard.module.css@@ -4,7 +4,7 @@border-radius: 0.5rem;overflow: hidden;border: 1px solid var(--mb-color-upsell-secondary);- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);&.Large {.MainStack {diff --git a/frontend/src/metabase/common/components/UserAvatar/UserAvatar.styled.tsx b/frontend/src/metabase/common/components/UserAvatar/UserAvatar.styled.tsxindex 1f45bb11304..35384788567 100644--- a/frontend/src/metabase/common/components/UserAvatar/UserAvatar.styled.tsx+++ b/frontend/src/metabase/common/components/UserAvatar/UserAvatar.styled.tsx@@ -11,7 +11,7 @@ export interface AvatarProps {}export const Avatar = styled.div<AvatarProps>`- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);width: 3em;height: 3em;display: flex;diff --git a/frontend/src/metabase/common/components/tree/TreeNode.styled.tsx b/frontend/src/metabase/common/components/tree/TreeNode.styled.tsxindex 97d7193e7e0..5e3f2a84b6c 100644--- a/frontend/src/metabase/common/components/tree/TreeNode.styled.tsx+++ b/frontend/src/metabase/common/components/tree/TreeNode.styled.tsx@@ -17,7 +17,7 @@ export const TreeNodeRoot = styled.li<TreeNodeRootProps>`display: flex;align-items: center;color: ${(props) =>- props.isSelected ? color("text-white") : color("brand")};+ props.isSelected ? color("text-primary-inverse") : color("brand")};background-color: ${(props) => (props.isSelected ? color("brand") : "unset")};padding-left: ${(props) => props.depth + 0.5}rem;padding-right: 0.5rem;diff --git a/frontend/src/metabase/common/components/upload/UploadTooltip.tsx b/frontend/src/metabase/common/components/upload/UploadTooltip.tsxindex 1b1eaa341cf..8998b783e6d 100644--- a/frontend/src/metabase/common/components/upload/UploadTooltip.tsx+++ b/frontend/src/metabase/common/components/upload/UploadTooltip.tsx@@ -19,11 +19,11 @@ export const UploadTooltip = ({<Box ta="center"><Textsize="sm"- c="var(--mb-color-tooltip-text)"+ c="tooltip-text">{t`Upload data to ${collection.name}`}</Text><Textsize="sm"- c="var(--mb-color-tooltip-text-secondary)"+ c="tooltip-text-secondary">{t`${UPLOAD_DATA_FILE_TYPES.join(", ",)} (${MAX_UPLOAD_STRING} MB max)`}</Text>diff --git a/frontend/src/metabase/css/admin.module.css b/frontend/src/metabase/css/admin.module.cssindex c447ca2c42d..3217be319d4 100644--- a/frontend/src/metabase/css/admin.module.css+++ b/frontend/src/metabase/css/admin.module.css@@ -32,7 +32,7 @@}.ContentTable th {- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);padding: 1em;}@@ -47,7 +47,7 @@}.AdminList {- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);border: var(--border-size) var(--border-style) var(--mb-color-border);border-radius: var(--default-border-radius);width: 266px;@@ -66,7 +66,7 @@bottom: 0;margin: auto;margin-left: 1em;- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);}.AdminListSearch .AdminInput {@@ -92,7 +92,7 @@.AdminListItem.selected,.AdminListItem:hover {- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);border-color: var(--mb-color-border);margin-left: -0.5em;margin-right: -0.5em;@@ -105,16 +105,16 @@margin-top: 1em;padding: 0.5em 1em 0.5em 1em;text-transform: uppercase;- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);font-weight: 700;font-size: smaller;padding-right: 15px; /* set so that table visibility icons align */}.AdminInput {- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);padding: var(--padding-1);- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);border: 1px solid transparent;}@@ -152,7 +152,7 @@.AdminTable th {text-transform: uppercase;- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);padding: var(--padding-1);font-weight: normal;}diff --git a/frontend/src/metabase/css/components/buttons.module.css b/frontend/src/metabase/css/components/buttons.module.cssindex e8fe55df87c..b4febe1b707 100644--- a/frontend/src/metabase/css/components/buttons.module.css+++ b/frontend/src/metabase/css/components/buttons.module.css@@ -21,11 +21,11 @@.Button:hover {color: var(--mb-color-text-brand);border-color: var(--mb-color-border);- background: var(--mb-color-bg-light);+ background: var(--mb-color-background-secondary);}.Button:focus-visible {- border-color: var(--mb-color-background);+ border-color: var(--mb-color-background-primary);outline: 1px solid var(--mb-color-brand);}@@ -58,36 +58,36 @@}.ButtonPrimary {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);background: var(--mb-color-brand);border-color: var(--mb-color-brand);}.ButtonPrimary:hover {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);border-color: var(--mb-color-brand);background-color: var(--mb-color-brand-alpha-88);}.ButtonPrimary:focus-visible {- border-color: var(--mb-color-background);+ border-color: var(--mb-color-background-primary);outline-color: var(--mb-color-brand);}.ButtonWarning {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);background: var(--mb-color-error);border-color: var(--mb-color-error);}.ButtonWarning:hover {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);border-color: var(--mb-color-error);background-color: var(--mb-color-error);}.ButtonWarning:focus-visible {- border-color: var(--mb-color-background);+ border-color: var(--mb-color-background-primary);outline-color: var(--mb-color-error);}@@ -96,31 +96,31 @@}.ButtonWhite {- background-color: var(--mb-color-bg-white);- color: var(--mb-color-text-dark);+ background-color: var(--mb-color-background-primary);+ color: var(--mb-color-text-primary);border-color: var(--mb-color-border);}.ButtonBorderless {border-color: transparent;background: transparent;- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);}.ButtonBorderless:hover {border-color: transparent;- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);}.ButtonBorderless:focus-visible {- border-color: var(--mb-color-background);+ border-color: var(--mb-color-background-primary);outline-color: var(--mb-color-brand);}.ButtonOnlyIcon {border: none;background: transparent;- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);padding: 0;}@@ -149,7 +149,7 @@.ButtonGroup .ButtonActive {background-color: var(--mb-color-success);- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);}.ButtonGroup .Button:first-child {@@ -163,7 +163,7 @@.ButtonGroupBrand .Button {border-color: white;color: var(--mb-color-brand);- background-color: var(--mb-color-bg-medium);+ background-color: var(--mb-color-background-tertiary);}.ButtonGroupBrand .ButtonActive {@@ -179,7 +179,7 @@.ButtonDanger {background-color: var(--mb-color-error);border-color: var(--mb-color-error);- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);}.ButtonDanger:hover {@@ -189,24 +189,24 @@}.ButtonDanger:focus-visible {- border-color: var(--mb-color-background);+ border-color: var(--mb-color-background-primary);outline-color: var(--mb-color-error);}.ButtonSuccess {background-color: var(--mb-color-success);border-color: var(--mb-color-success);- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);}.ButtonSuccess:hover {background-color: var(--mb-color-success);border-color: var(--mb-color-success);- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);}.ButtonSuccess:focus-visible {- border-color: var(--mb-color-background);+ border-color: var(--mb-color-background-primary);outline-color: var(--mb-color-success);}diff --git a/frontend/src/metabase/css/components/form.module.css b/frontend/src/metabase/css/components/form.module.cssindex 968c9f5c9cb..2317231063b 100644--- a/frontend/src/metabase/css/components/form.module.css+++ b/frontend/src/metabase/css/components/form.module.css@@ -1,18 +1,18 @@::-webkit-input-placeholder {- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);}:-moz-placeholder {- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);}:-ms-input-placeholder {- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);}.FormField {margin-bottom: 1.5em;- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);}.FormField.FormFieldError {@@ -31,8 +31,8 @@font-family: var(--mb-default-font-family);font-weight: 700;font-size: 16px;- color: var(--mb-color-text-dark);- background-color: var(--mb-color-bg-white);+ color: var(--mb-color-text-primary);+ background-color: var(--mb-color-background-primary);padding: 0.75em;border: 1px solid var(--mb-color-border);border-radius: 8px;diff --git a/frontend/src/metabase/css/components/list.module.css b/frontend/src/metabase/css/components/list.module.cssindex de446931ac6..ae1f4223c5d 100644--- a/frontend/src/metabase/css/components/list.module.css+++ b/frontend/src/metabase/css/components/list.module.css@@ -1,6 +1,6 @@.ListSectionHeader :global(.Icon),.ListItem .ListItemArrow :global(.Icon) {- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);}.ListSectionHeader:hover :global(.Icon) {@@ -8,11 +8,11 @@}.ListItem :global(.Icon) {- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);}.ListSectionHeader {- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);border: 2px solid transparent;/* so that spacing matches [data-element-id=list-item] */@@ -34,7 +34,7 @@}.ListSectionExpanded .ListSectionHeader .ListSectionTitle {- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);}.ListSectionTitle {@@ -61,28 +61,28 @@/* LIST ITEM TITLE */.ListItemTitle {- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);}.ListItemDisabled .ListItemTitle {- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);}.ListItemCursor:not(.ListItemDisabled) .ListItemTitle,.ListItem:not(.ListItemDisabled):hover .ListItemTitle,.ListItemSelected:not(.ListItemDisabled) .ListItemTitle {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);}/* LIST ITEM DESCRIPTION */.ListItemDescription {margin-top: 0.25em;margin-bottom: 0;- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);}.ListItemDisabled .ListItemDescription {- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);}.ListItemCursor:not(.ListItemDisabled) .ListItemDescription,@@ -95,7 +95,7 @@.ListItemCursor:not(.ListItemDisabled) :global(.Icon),.ListItem:not(.ListItemDisabled):hover :global(.Icon),.ListItemSelected:not(.ListItemDisabled) :global(.Icon) {- color: var(--mb-color-text-white) !important;+ color: var(--mb-color-text-primary-inverse) !important;}/* Moved from `query_builder.module.css` to make migration easier */diff --git a/frontend/src/metabase/css/components/modal.module.css b/frontend/src/metabase/css/components/modal.module.cssindex e0fac2b8b86..c5e986e4332 100644--- a/frontend/src/metabase/css/components/modal.module.css+++ b/frontend/src/metabase/css/components/modal.module.css@@ -41,7 +41,7 @@}.ModalFull {- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);position: fixed;top: 0;bottom: 0;@@ -50,7 +50,7 @@}.ModalBackdrop {- background-color: var(--mb-color-bg-black-alpha-60);+ background-color: var(--mb-color-overlay);}/* TRANSITIONS */@@ -61,7 +61,7 @@.ModalBackdrop.ModalEnter {background-color: color-mix(in srgb,- var(--mb-color-bg-black) 1%,+ var(--mb-color-background-primary-inverse) 1%,transparent);}@@ -69,18 +69,18 @@.ModalBackdrop.ModalAppearActive,.ModalBackdrop.ModalEnterActive {transition: background-color 200ms ease-in-out;- background-color: var(--mb-color-bg-black-alpha-60);+ background-color: var(--mb-color-overlay);}.ModalBackdrop.ModalExit {- background-color: var(--mb-color-bg-black-alpha-60);+ background-color: var(--mb-color-overlay);}.ModalBackdrop.ModalExitActive {transition: background-color 200ms ease-in-out 100ms;background-color: color-mix(in srgb,- var(--mb-color-bg-black) 1%,+ var(--mb-color-background-primary-inverse) 1%,transparent);}diff --git a/frontend/src/metabase/css/core/base.styled.ts b/frontend/src/metabase/css/core/base.styled.tsindex a6c33cc615c..ee85dc2104a 100644--- a/frontend/src/metabase/css/core/base.styled.ts+++ b/frontend/src/metabase/css/core/base.styled.ts@@ -10,7 +10,7 @@ export const rootStyle = css`height: 100%; /* ensure the entire page will fill the window */display: flex;flex-direction: column;- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);-webkit-font-smoothing: antialiased;-moz-osx-font-smoothing: grayscale;`;diff --git a/frontend/src/metabase/css/core/colors.module.css b/frontend/src/metabase/css/core/colors.module.cssindex a87554efdf4..cc34a3fc2ec 100644--- a/frontend/src/metabase/css/core/colors.module.css+++ b/frontend/src/metabase/css/core/colors.module.css@@ -21,7 +21,7 @@*/.textDefault {- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);}.textBrand,@@ -50,29 +50,29 @@}.bgErrorInput {- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);}.textSlate {- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);}.textSlateLight {- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);}.textLight {- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);}.textMedium,.textMediumHover:hover {- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);}.textDark,.textDarkHover:hover {- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);}.textPrimary {@@ -94,26 +94,26 @@.bgLight,.bgLightHover:hover {- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);}.bgMedium,.bgMediumHover:hover {- background-color: var(--mb-color-bg-medium);+ background-color: var(--mb-color-background-tertiary);}/* white - move to bottom for specificity since its often used on hovers, etc */.textWhite,.textWhiteHover:hover {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);}.bgWhite {- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);}.bgLightBlue {- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);}.textTooltipSecondary {diff --git a/frontend/src/metabase/css/core/colors.stories.tsx b/frontend/src/metabase/css/core/colors.stories.tsxindex e2643025b2e..783ef62e46b 100644--- a/frontend/src/metabase/css/core/colors.stories.tsx+++ b/frontend/src/metabase/css/core/colors.stories.tsx@@ -13,17 +13,16 @@ const COLOR_NAMES = ["--mb-color-summarize","--mb-color-error","--mb-color-danger",- "--mb-color-text-dark",- "--mb-color-text-medium",- "--mb-color-text-light",- "--mb-color-bg-black",- "--mb-color-bg-dark",- "--mb-color-bg-medium",- "--mb-color-bg-light",- "--mb-color-bg-white",- "--mb-color-bg-error",+ "--mb-color-text-primary",+ "--mb-color-text-secondary",+ "--mb-color-text-tertiary",+ "--mb-color-background-primary-inverse",+ "--mb-color-background-tertiary-inverse",+ "--mb-color-background-tertiary",+ "--mb-color-background-secondary",+ "--mb-color-background-primary",+ "--mb-color-background-error","--mb-color-background-error",- "--mb-color-bg-night","--mb-color-shadow","--mb-color-border","--mb-color-filter",@@ -35,18 +34,18 @@ const COLOR_NAMES = ["--mb-color-text-tertiary","--mb-color-text-selected","--mb-color-text-brand",- "--mb-color-text-white",- "--mb-color-background",+ "--mb-color-text-primary-inverse",+ "--mb-color-background-primary","--mb-color-background-selected","--mb-color-background-disabled",- "--mb-color-background-inverse",+ "--mb-color-background-primary-inverse",// other colors from css-variables.ts"--mb-color-brand-alpha-04","--mb-color-brand-alpha-88",- "--mb-color-border-alpha-30",- "--mb-color-text-white-alpha-85",- "--mb-color-bg-black-alpha-60",- "--mb-color-bg-white-alpha-15",+ "--mb-color-border",+ "--mb-color-text-primary-inverse",+ "--mb-color-overlay",+ "--mb-color-background-primary-alpha-15",];export function Default() {@@ -62,7 +61,7 @@ export function Default() {flexBasis: "24%",}}>- <Text color="black">{colorName}</Text>+ <Text c="black">{colorName}</Text></Card>);})}diff --git a/frontend/src/metabase/css/core/inputs.module.css b/frontend/src/metabase/css/core/inputs.module.cssindex 089cec576a6..c5e087fe17f 100644--- a/frontend/src/metabase/css/core/inputs.module.css+++ b/frontend/src/metabase/css/core/inputs.module.css@@ -4,8 +4,8 @@}.input {- color: var(--mb-color-text-dark);- background-color: var(--mb-color-background);+ color: var(--mb-color-text-primary);+ background-color: var(--mb-color-background-primary);font-size: 1.12em;padding: 0.75rem 0.75rem;border: 1px solid var(--input-border-color);@@ -24,7 +24,7 @@outline: none;border: 1px solid var(--mb-color-brand);transition: border 0.3s linear;- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);}.inputBorderless,diff --git a/frontend/src/metabase/css/core/overlays/OverlaysDemo.tsx b/frontend/src/metabase/css/core/overlays/OverlaysDemo.tsxindex 8cbb55d6f8c..8030524f46e 100644--- a/frontend/src/metabase/css/core/overlays/OverlaysDemo.tsx+++ b/frontend/src/metabase/css/core/overlays/OverlaysDemo.tsx@@ -236,8 +236,7 @@ export const OverlaysDemo = ({ enableNesting }: OverlaysDemoProps) => {><CloseButtononClick={() => setActionToastCount((c) => c - 1)}- // eslint-disable-next-line no-color-literals- c="#fff"+ c="white"bg="transparent"/>{enableNesting && <Launchers />}diff --git a/frontend/src/metabase/css/core/scroll.module.css b/frontend/src/metabase/css/core/scroll.module.cssindex 1f6b3487d84..a4da90fa180 100644--- a/frontend/src/metabase/css/core/scroll.module.css+++ b/frontend/src/metabase/css/core/scroll.module.css@@ -23,7 +23,7 @@border: 4px solid transparent;border-radius: 7px;background-clip: padding-box;- background-color: var(--mb-color-bg-medium);+ background-color: var(--mb-color-background-tertiary);}.scrollShow::-webkit-scrollbar-button {@@ -37,30 +37,30 @@}.scrollShow:hover::-webkit-scrollbar-thumb {- background-color: var(--mb-color-bg-dark);+ background-color: var(--mb-color-background-tertiary-inverse);}.scrollShow::-webkit-scrollbar-thumb:horizontal:hover,.scrollShow::-webkit-scrollbar-thumb:vertical:hover {- background-color: var(--mb-color-bg-dark);+ background-color: var(--mb-color-background-tertiary-inverse);}.scrollShow::-webkit-scrollbar-thumb:horizontal:active,.scrollShow::-webkit-scrollbar-thumb:vertical:active {- background-color: var(--mb-color-bg-dark);+ background-color: var(--mb-color-background-tertiary-inverse);}/* scroll light */.scrollShow.scrollLight::-webkit-scrollbar-thumb {border-radius: 0;- background-color: var(--mb-color-bg-medium);+ background-color: var(--mb-color-background-tertiary);}.scrollShow.scrollLight::-webkit-scrollbar-thumb:horizontal:hover,.scrollShow.scrollLight::-webkit-scrollbar-thumb:vertical:hover,.scrollShow.scrollLight::-webkit-scrollbar-thumb:horizontal:active,.scrollShow.scrollLight::-webkit-scrollbar-thumb:vertical:active {- background-color: var(--mb-color-bg-medium);+ background-color: var(--mb-color-background-tertiary);}.scrollHide {diff --git a/frontend/src/metabase/css/core/text.module.css b/frontend/src/metabase/css/core/text.module.cssindex f1681e56a10..880ac1d5e8a 100644--- a/frontend/src/metabase/css/core/text.module.css+++ b/frontend/src/metabase/css/core/text.module.css@@ -38,7 +38,7 @@.textBody {font-size: 1.286em;line-height: 1.457em;- color: var(--mb-color-text-medium); /* TODO - is this bad? */+ color: var(--mb-color-text-secondary); /* TODO - is this bad? */}.textList {@@ -86,8 +86,8 @@.textCode {font-family: monospace;- color: var(--mb-color-text-medium);- background-color: var(--mb-color-bg-medium);+ color: var(--mb-color-text-secondary);+ background-color: var(--mb-color-background-tertiary);border-radius: 2px;padding: 0.2em 0.4em;line-height: 1.4em;diff --git a/frontend/src/metabase/css/dashboard.module.css b/frontend/src/metabase/css/dashboard.module.cssindex d50d6aefee7..0c70e5ac7d6 100644--- a/frontend/src/metabase/css/dashboard.module.css+++ b/frontend/src/metabase/css/dashboard.module.css@@ -5,7 +5,7 @@}.Dashboard.DashboardFullscreen .fullscreenNormalText {- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);transition: var(--transition-theme-change);}@@ -41,7 +41,7 @@.PinMapUpdateButtonDisabled {pointer-events: none;- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);}/* .react-draggable*, .react-resizable* are 3rd party library classes */@@ -60,7 +60,7 @@.DashEditing .DashCard:global(.react-draggable-dragging) .Card,.DashEditing .DashCard:global(.react-resizable-resizing) .Card {- background-color: var(--mb-color-bg-medium) !important;+ background-color: var(--mb-color-background-tertiary) !important;border: 1px solid var(--mb-color-brand);}@@ -124,7 +124,7 @@/* .react-grid-placeholder is a global class from `react-grid-layout` */.DashEditing :global(.react-grid-placeholder) {z-index: 0;- background-color: var(--mb-color-bg-light) !important;+ background-color: var(--mb-color-background-secondary) !important;transition: all 0.15s linear;}@@ -144,7 +144,7 @@:global(.dc-chart .axis .tick text),:global(.dc-chart .x-axis-label),:global(.dc-chart .y-axis-label) {- fill: var(--mb-color-text-dark);+ fill: var(--mb-color-text-primary);}}diff --git a/frontend/src/metabase/css/query_builder.module.css b/frontend/src/metabase/css/query_builder.module.cssindex 4cc4031ec85..1de4b9b9ca9 100644--- a/frontend/src/metabase/css/query_builder.module.css+++ b/frontend/src/metabase/css/query_builder.module.css@@ -13,7 +13,7 @@text-transform: uppercase;font-size: 10px;font-weight: 700;- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);}.QueryFilters {@@ -65,7 +65,7 @@align-items: center;cursor: pointer;padding: 0.75rem 1.5rem 0.75rem 0.75rem;- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);}.SelectionItem:hover {@@ -87,15 +87,15 @@}.SelectionItem:hover :global(.Icon) {- color: var(--mb-color-text-white) !important;+ color: var(--mb-color-text-primary-inverse) !important;}.SelectionItem:hover .SelectionModuleDisplay {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);}.SelectionItem:hover .SelectionModuleDescription {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);}.SelectionItem.SelectionItemSelected :global(.Icon-check) {@@ -108,7 +108,7 @@}.SelectionModuleDescription {- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);font-size: 0.8rem;}@@ -169,7 +169,7 @@font-size: 10px;text-align: center;text-transform: uppercase;- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);padding-left: var(--padding-1);padding-right: var(--padding-1);position: absolute;@@ -194,7 +194,7 @@flex-direction: column;font-size: 0.9em;z-index: 2;- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);border: 1px solid var(--mb-color-border);}@@ -248,7 +248,7 @@}.GuiBuilderSectionLabel {- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);position: absolute;top: -7px;left: 10px;@@ -293,14 +293,14 @@max-height: 200px;overflow: scroll;padding: 1em;- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);border: 1px solid var(--mb-color-border);border-radius: 2px;white-space: pre-wrap;}.QuestionTooltipTarget {- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);border: 2px solid currentColor;border-radius: 99px;width: 20px;@@ -326,7 +326,7 @@.Overlay {background-color: color-mix(in srgb,- var(--mb-color-bg-white) 75%,+ var(--mb-color-background-primary) 75%,transparent);transition:@@ -340,7 +340,7 @@background-color: color-mix(in srgb,var(--mb-color-brand) 3%,- color-mix(in srgb, var(--mb-color-bg-white) 75%, transparent)+ color-mix(in srgb, var(--mb-color-background-primary) 75%, transparent));}}diff --git a/frontend/src/metabase/dashboard/actions/parameters.tsx b/frontend/src/metabase/dashboard/actions/parameters.tsxindex 3a99f80025b..bb02442d60e 100644--- a/frontend/src/metabase/dashboard/actions/parameters.tsx+++ b/frontend/src/metabase/dashboard/actions/parameters.tsx@@ -245,7 +245,7 @@ export const moveParameter =message: (<TextclassName={cx(CS.flex, CS.flexFull, CS.flexNoShrink)}- c="text-white"+ c="text-primary-inverse"w="8rem">{t`Filter moved`}</Text>),diff --git a/frontend/src/metabase/dashboard/components/ActionSidebar/ActionSidebar.tsx b/frontend/src/metabase/dashboard/components/ActionSidebar/ActionSidebar.tsxindex 9c6dfe06845..df3f2d8150b 100644--- a/frontend/src/metabase/dashboard/components/ActionSidebar/ActionSidebar.tsx+++ b/frontend/src/metabase/dashboard/components/ActionSidebar/ActionSidebar.tsx@@ -47,7 +47,7 @@ export function ActionSidebar() {return (<Sidebar><Box px="xl" py="md">- <Title order={4} c="text-dark" fz="lg">{t`Button properties`}</Title>+ <Title order={4} c="text-primary" fz="lg">{t`Button properties`}</Title></Box><Divider /><Stack px="xl" py="md" flex={1} className={CS.overflowYAuto}>diff --git a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/ClickBehaviorSidebar.module.css b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/ClickBehaviorSidebar.module.cssindex c55178e99ff..e6efd598e25 100644--- a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/ClickBehaviorSidebar.module.css+++ b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/ClickBehaviorSidebar.module.css@@ -17,7 +17,7 @@}.Heading {- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);padding-top: 22px;padding-bottom: 16px;margin-bottom: 8px;diff --git a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/CustomLinkText.module.css b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/CustomLinkText.module.cssindex e81de8d18e1..273cb54623b 100644--- a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/CustomLinkText.module.css+++ b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/CustomLinkText.module.css@@ -1,6 +1,6 @@.Label {display: block;- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);font-weight: 700;padding-top: 22px;padding-bottom: 16px;diff --git a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/LinkOptions.module.css b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/LinkOptions.module.cssindex 4f22ca66cde..795d42021de 100644--- a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/LinkOptions.module.css+++ b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/LinkOptions.module.css@@ -16,14 +16,14 @@flex: 1 1 auto;border-right-color: color-mix(in srgb,- var(--mb-color-bg-white),+ var(--mb-color-background-primary),transparent 25%);&[data-variant="filled"]:hover {border-right-color: color-mix(in srgb,- var(--mb-color-bg-white),+ var(--mb-color-background-primary),transparent 25%);}diff --git a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/ValuesYouCanReference.module.css b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/ValuesYouCanReference.module.cssindex cb4799833de..a83e44eb07c 100644--- a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/ValuesYouCanReference.module.css+++ b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/ValuesYouCanReference.module.css@@ -1,6 +1,6 @@.PopoverTrigger {cursor: pointer;- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);&:hover {color: var(--mb-color-brand);diff --git a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/SidebarItem/SidebarItem.module.css b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/SidebarItem/SidebarItem.module.cssindex 2245396e98c..98cb55ed1bc 100644--- a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/SidebarItem/SidebarItem.module.css+++ b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/SidebarItem/SidebarItem.module.css@@ -36,6 +36,6 @@&.isSelected {background-color: var(--mb-color-brand);- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);}}diff --git a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/TypeSelector/TypeSelector.module.css b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/TypeSelector/TypeSelector.module.cssindex 519b25f2429..51f1795e976 100644--- a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/TypeSelector/TypeSelector.module.css+++ b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/TypeSelector/TypeSelector.module.css@@ -2,14 +2,14 @@border-color: var(--mb-color-border);.Icon {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);}&.isSelected {border-color: transparent;.Icon {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);}}}diff --git a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/TypeSelector/TypeSelector.tsx b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/TypeSelector/TypeSelector.tsxindex 598971e5269..22dad2c7d5c 100644--- a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/TypeSelector/TypeSelector.tsx+++ b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/TypeSelector/TypeSelector.tsx@@ -48,7 +48,7 @@ export const BehaviorOption = ({[S.isSelected]: selected,})}name={selected ? "check" : icon}- c={selected ? "text-white" : "brand"}+ c={selected ? "text-primary-inverse" : "brand"}/><SidebarItem.Content><SidebarItem.Name>{behaviorOptionName}</SidebarItem.Name>diff --git a/frontend/src/metabase/dashboard/components/ClickMappings.module.css b/frontend/src/metabase/dashboard/components/ClickMappings.module.cssindex 1485c4ad026..3213be4c5cb 100644--- a/frontend/src/metabase/dashboard/components/ClickMappings.module.css+++ b/frontend/src/metabase/dashboard/components/ClickMappings.module.css@@ -3,6 +3,6 @@&:hover {color: var(--mb-color-brand);- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);}}diff --git a/frontend/src/metabase/dashboard/components/DashCard/ClickBehaviorSidebarOverlay/ClickBehaviorSidebarOverlay.module.css b/frontend/src/metabase/dashboard/components/DashCard/ClickBehaviorSidebarOverlay/ClickBehaviorSidebarOverlay.module.cssindex 65013862414..afc0eb27630 100644--- a/frontend/src/metabase/dashboard/components/DashCard/ClickBehaviorSidebarOverlay/ClickBehaviorSidebarOverlay.module.css+++ b/frontend/src/metabase/dashboard/components/DashCard/ClickBehaviorSidebarOverlay/ClickBehaviorSidebarOverlay.module.css@@ -8,7 +8,7 @@}.ClickIcon {- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);&.isActive {color: unset;@@ -18,11 +18,11 @@.Button {border-radius: 8px;cursor: pointer;- background-color: var(--mb-color-bg-light);- color: var(--mb-color-text-medium);+ background-color: var(--mb-color-background-secondary);+ color: var(--mb-color-text-secondary);&.isActive {background-color: var(--mb-color-brand);- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);}}diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCard.module.css b/frontend/src/metabase/dashboard/components/DashCard/DashCard.module.cssindex f74d00c3d1d..74a945d5a88 100644--- a/frontend/src/metabase/dashboard/components/DashCard/DashCard.module.css+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCard.module.css@@ -24,7 +24,7 @@}&.shouldForceHiddenBackground {- background: var(--mb-color-bg-light);+ background: var(--mb-color-background-secondary);border: none !important;&.isEmbeddingSdk {diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCard.tsx b/frontend/src/metabase/dashboard/components/DashCard/DashCard.tsxindex d88a08a1b03..e0c633604b0 100644--- a/frontend/src/metabase/dashboard/components/DashCard/DashCard.tsx+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCard.tsx@@ -24,7 +24,6 @@ import { PLUGIN_COLLECTIONS } from "metabase/plugins";import EmbedFrameS from "metabase/public/components/EmbedFrame/EmbedFrame.module.css";import { getMetadata } from "metabase/selectors/metadata";import { Box } from "metabase/ui";-import { color } from "metabase/ui/utils/colors";import { getVisualizationRaw } from "metabase/visualizations";import { extendCardWithDashcardSettings } from "metabase/visualizations/lib/settings/typed-utils";import {@@ -257,7 +256,7 @@ function DashCardInner({const iconSize = 16;return {name: opts.icon,- color: opts.color ? color(opts.color) : undefined,+ color: opts.color,tooltip: opts.tooltips?.belonging,size: iconSize,diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCardActionsPanel/DashCardActionButton/DashCardActionButton.module.css b/frontend/src/metabase/dashboard/components/DashCard/DashCardActionsPanel/DashCardActionButton/DashCardActionButton.module.cssindex 0a0877e419b..d9a5e166b55 100644--- a/frontend/src/metabase/dashboard/components/DashCard/DashCardActionsPanel/DashCardActionButton/DashCardActionButton.module.css+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCardActionsPanel/DashCardActionButton/DashCardActionButton.module.css@@ -5,6 +5,6 @@padding: 4px;&:hover {- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);}}diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCardActionsPanel/DashCardActionsPanel.module.css b/frontend/src/metabase/dashboard/components/DashCard/DashCardActionsPanel/DashCardActionsPanel.module.cssindex 397c2745cc6..49d07b3b23f 100644--- a/frontend/src/metabase/dashboard/components/DashCard/DashCardActionsPanel/DashCardActionsPanel.module.css+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCardActionsPanel/DashCardActionsPanel.module.css@@ -1,7 +1,7 @@.DashCardActionButtonsContainer {display: flex;align-items: center;- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);line-height: 1px;gap: 0.5rem;}diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCardParameterMapper/DashCardCardParameterMapper.tsx b/frontend/src/metabase/dashboard/components/DashCard/DashCardParameterMapper/DashCardCardParameterMapper.tsxindex cecfd15ca76..1f3c06146b0 100644--- a/frontend/src/metabase/dashboard/components/DashCard/DashCardParameterMapper/DashCardCardParameterMapper.tsx+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCardParameterMapper/DashCardCardParameterMapper.tsx@@ -166,7 +166,7 @@ export function DashCardCardParameterMapper({fw="bold"fz="sm"lh={1}- color="text-light"+ color="text-tertiary">{t`Auto-connected`}</Text></Flex>);diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCardParameterMapper/DashCardParameterMapper.jsx b/frontend/src/metabase/dashboard/components/DashCard/DashCardParameterMapper/DashCardParameterMapper.jsxindex c68eb716c75..8aef911ecd7 100644--- a/frontend/src/metabase/dashboard/components/DashCard/DashCardParameterMapper/DashCardParameterMapper.jsx+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCardParameterMapper/DashCardParameterMapper.jsx@@ -27,7 +27,7 @@ export const DashCardParameterMapper = ({<divclassName={cx(CS.mx4, CS.my1, CS.p1, CS.rounded, CS.textMedium)}style={{- backgroundColor: color("bg-light"),+ backgroundColor: color("background-secondary"),marginTop: -10,}}>diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCardParameterMapper/DashCardParameterMapper.module.css b/frontend/src/metabase/dashboard/components/DashCard/DashCardParameterMapper/DashCardParameterMapper.module.cssindex b696e731a88..dc9103cbacf 100644--- a/frontend/src/metabase/dashboard/components/DashCard/DashCardParameterMapper/DashCardParameterMapper.module.css+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCardParameterMapper/DashCardParameterMapper.module.css@@ -4,7 +4,7 @@}.TextCardDefault {- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);margin: 0.5rem 0;align-items: baseline;line-height: 1.5rem;@@ -21,16 +21,16 @@}.Header {- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);}.TargetButton {- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);cursor: pointer;border: 2px solid var(--mb-color-brand);border-radius: 8px;min-height: 30px;- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);&.disabled {opacity: 0.4;@@ -40,20 +40,20 @@&.mapped {border-color: var(--mb-color-brand);background-color: var(--mb-color-brand);- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);}&.unauthed {pointer-events: none;- border-color: var(--mb-color-bg-light);- background-color: var(--mb-color-bg-light);- color: var(--mb-color-text-medium);+ border-color: var(--mb-color-background-secondary);+ background-color: var(--mb-color-background-secondary);+ color: var(--mb-color-text-secondary);}&.invalid {border-color: var(--mb-color-error);background-color: var(--mb-color-error);- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);}}@@ -62,16 +62,16 @@}.CloseIconButton {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);background-color: transparent;border: none;padding: 0.25rem !important;&:hover {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);background-color: color-mix(in srgb,- var(--mb-color-bg-white),+ var(--mb-color-background-primary),transparent 80%);}diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCardParameterMapper/DisabledNativeCardHelpText/DisabledNativeCardHelpText.module.css b/frontend/src/metabase/dashboard/components/DashCard/DashCardParameterMapper/DisabledNativeCardHelpText/DisabledNativeCardHelpText.module.cssindex 610543af9bd..a6d32569700 100644--- a/frontend/src/metabase/dashboard/components/DashCard/DashCardParameterMapper/DisabledNativeCardHelpText/DisabledNativeCardHelpText.module.css+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCardParameterMapper/DisabledNativeCardHelpText/DisabledNativeCardHelpText.module.css@@ -1,10 +1,10 @@.NativeCardText {- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);text-align: center;}.NativeCardIcon {- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);}.NativeCardLink {diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.module.css b/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.module.cssindex 5d8d3e846ed..00aced7c5dd 100644--- a/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.module.css+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCardVisualization.module.css@@ -1,9 +1,9 @@.DashCardVisualization {- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);}.VirtualDashCardOverlayText {- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);}.InlineParametersList *,diff --git a/frontend/src/metabase/dashboard/components/Dashboard/Dashboard.module.css b/frontend/src/metabase/dashboard/components/Dashboard/Dashboard.module.cssindex 2fea5dbc39a..4cd94a1061c 100644--- a/frontend/src/metabase/dashboard/components/Dashboard/Dashboard.module.css+++ b/frontend/src/metabase/dashboard/components/Dashboard/Dashboard.module.css@@ -1,6 +1,6 @@.DashboardBody {flex: 1 0 auto;- background-color: var(--mb-color-bg-secondary);+ background-color: var(--mb-color-background-secondary);&.isEditingOrSharing {flex-basis: 0;@@ -27,7 +27,7 @@}&:not(.isEmbeddingSdk) {- background-color: var(--mb-color-background);+ background-color: var(--mb-color-background-primary);}&.isFullscreen {diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderView.module.css b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderView.module.cssindex 444cab99a42..c0252e37f62 100644--- a/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderView.module.css+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderView.module.css@@ -26,7 +26,7 @@.HeaderButtonsContainer {align-items: center;- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);@media screen and (min-width: 40em) {margin-left: auto;diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderView.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderView.tsxindex 0e87170b681..c1e8cc07c05 100644--- a/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderView.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderView.tsx@@ -161,7 +161,7 @@ export function DashboardHeaderView({/>{!!collection && (<PLUGIN_COLLECTION_COMPONENTS.CollectionInstanceAnalyticsIcon- color="brand"+ c="brand"collection={collection}entity="dashboard"/>diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/SectionLayoutPreview.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/SectionLayoutPreview.tsxindex 4f294d8ee50..d57ba2f0b4a 100644--- a/frontend/src/metabase/dashboard/components/DashboardHeader/SectionLayoutPreview.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/SectionLayoutPreview.tsx@@ -75,7 +75,7 @@ function PreviewCard({h={`${height}px`}top={`${top}px`}left={`${left}px`}- bg="bg-white"+ bg="background-primary"style={{ borderRadius: "2px" }}/>);diff --git a/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardDetails.tsx b/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardDetails.tsxindex 70d28e5685d..5328828ada2 100644--- a/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardDetails.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardDetails.tsx@@ -65,7 +65,7 @@ export const DashboardDetails = ({ dashboard }: { dashboard: Dashboard }) => {<FixedSizeIconname="folder"className={SidebarStyles.IconMargin}- color="var(--mb-color-brand)"+ c="brand"/><div><Text>@@ -95,7 +95,7 @@ function SharingDisplay({ dashboard }: { dashboard: Dashboard }) {<SidesheetCardSection title={t`Visibility`}>{publicUUID && (<Flex gap="sm" align="center">- <FixedSizeIcon name="globe" color="var(--mb-color-brand)" />+ <FixedSizeIcon name="globe" c="brand" /><Text>{t`Shared publicly`}</Text><DashboardPublicLinkPopoverdiff --git a/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardInfoSidebar.module.css b/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardInfoSidebar.module.cssindex 159acd42a1c..58b8ee51786 100644--- a/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardInfoSidebar.module.css+++ b/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardInfoSidebar.module.css@@ -1,6 +1,6 @@.BrandCircle {background-color: var(--mb-color-brand);- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);border-radius: 50%;height: 1rem;width: 1rem;diff --git a/frontend/src/metabase/dashboard/components/DashboardLeaveConfirmationModal/DashboardLeaveConfirmationModal.tsx b/frontend/src/metabase/dashboard/components/DashboardLeaveConfirmationModal/DashboardLeaveConfirmationModal.tsxindex 5625973e2ac..7b1c76c63cc 100644--- a/frontend/src/metabase/dashboard/components/DashboardLeaveConfirmationModal/DashboardLeaveConfirmationModal.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardLeaveConfirmationModal/DashboardLeaveConfirmationModal.tsx@@ -40,7 +40,7 @@ export const DashboardLeaveConfirmationModal = withRouter(title: t`Discard your changes?`,message: t`Your changes haven’t been saved, so you’ll lose them if you navigate away.`,actionBtn: {- color: "danger",+ color: "danger" as const,message: t`Discard changes`,},};diff --git a/frontend/src/metabase/dashboard/components/DashboardMoveModal.tsx b/frontend/src/metabase/dashboard/components/DashboardMoveModal.tsxindex 2aedaf32ac3..6a847657964 100644--- a/frontend/src/metabase/dashboard/components/DashboardMoveModal.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardMoveModal.tsx@@ -72,7 +72,7 @@ const DashboardMoveToast = ({<Iconname="collection"style={{ marginInlineEnd: "0.25rem" }}- c="text-white"+ c="text-primary-inverse"/>{c("{0} is a location where the dashboard was moved to").jt`Dashboard moved to ${diff --git a/frontend/src/metabase/dashboard/components/DashboardParameterPanel/DashboardParameterPanel.module.css b/frontend/src/metabase/dashboard/components/DashboardParameterPanel/DashboardParameterPanel.module.cssindex f386b650a19..6cc210150f8 100644--- a/frontend/src/metabase/dashboard/components/DashboardParameterPanel/DashboardParameterPanel.module.css+++ b/frontend/src/metabase/dashboard/components/DashboardParameterPanel/DashboardParameterPanel.module.css@@ -13,7 +13,7 @@}&.isSticky {- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);&.isEmbeddingSdk {background-color: var(--mb-color-bg-dashboard);diff --git a/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionList.module.css b/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionList.module.cssindex 0d38b6bc858..08095c285a4 100644--- a/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionList.module.css+++ b/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionList.module.css@@ -24,11 +24,11 @@.VisualizerButton {visibility: hidden;background-color: var(--mb-color-brand);- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);cursor: pointer;&:hover {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);background-color: var(--mb-color-brand);}}diff --git a/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionPicker.module.css b/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionPicker.module.cssindex ad2d46a27a3..2bb93ed444f 100644--- a/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionPicker.module.css+++ b/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionPicker.module.css@@ -13,7 +13,7 @@button.newButton {width: 50%;- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);border-color: var(--mb-color-border);&:hover {diff --git a/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionPicker.tsx b/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionPicker.tsxindex f85c77acabd..d5417bb6962 100644--- a/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionPicker.tsx+++ b/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionPicker.tsx@@ -118,7 +118,7 @@ function QuestionPickerInner({const iconColor = PLUGIN_COLLECTIONS.isRegularCollection(collection,)- ? "text-light"+ ? "text-tertiary": icon.color;return (<SelectList.Item@@ -127,7 +127,7 @@ function QuestionPickerInner({name={collection.name}icon={{...icon,- color: iconColor,+ c: iconColor,}}rightIcon="chevronright"onSelect={(collectionId) =>diff --git a/frontend/src/metabase/dashboard/components/RefreshWidget/RefreshOption/RefreshOption.module.css b/frontend/src/metabase/dashboard/components/RefreshWidget/RefreshOption/RefreshOption.module.cssindex e8a20e31c8e..b239f2f90a1 100644--- a/frontend/src/metabase/dashboard/components/RefreshWidget/RefreshOption/RefreshOption.module.css+++ b/frontend/src/metabase/dashboard/components/RefreshWidget/RefreshOption/RefreshOption.module.css@@ -7,7 +7,7 @@padding-top: 0.5em;padding-bottom: 0.5em;cursor: pointer;- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);display: flex;align-items: center;}diff --git a/frontend/src/metabase/dashboard/components/RefreshWidget/RefreshWidget.tsx b/frontend/src/metabase/dashboard/components/RefreshWidget/RefreshWidget.tsxindex bf4e1bc40dc..b3ef7c274db 100644--- a/frontend/src/metabase/dashboard/components/RefreshWidget/RefreshWidget.tsx+++ b/frontend/src/metabase/dashboard/components/RefreshWidget/RefreshWidget.tsx@@ -91,7 +91,7 @@ export const RefreshWidget = (tt="uppercase"mb="md"ml="sm"- c="text-medium"+ c="text-secondary">{t`Auto Refresh`}</Box><ul>{OPTIONS.map((option) => (diff --git a/frontend/src/metabase/dashboard/components/Sidebar.module.css b/frontend/src/metabase/dashboard/components/Sidebar.module.cssindex 7c0ff05076a..0a4d994a9d6 100644--- a/frontend/src/metabase/dashboard/components/Sidebar.module.css+++ b/frontend/src/metabase/dashboard/components/Sidebar.module.css@@ -2,7 +2,7 @@display: flex;flex-direction: column;border-left: 1px solid var(--mb-color-border);- background: var(--mb-color-bg-white);+ background: var(--mb-color-background-primary);}.ChildrenContainer {diff --git a/frontend/src/metabase/dashboard/components/Sidebar.tsx b/frontend/src/metabase/dashboard/components/Sidebar.tsxindex 2544a829258..7f0cadfa02c 100644--- a/frontend/src/metabase/dashboard/components/Sidebar.tsx+++ b/frontend/src/metabase/dashboard/components/Sidebar.tsx@@ -59,7 +59,7 @@ export function Sidebar({{onCancel && (<Buttonvariant="subtle"- color="text-medium"+ color="text-secondary"onClick={onCancel}aria-label={t`Cancel`}>{t`Cancel`}</Button>diff --git a/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/AutomaticDashboardApp.module.css b/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/AutomaticDashboardApp.module.cssindex f9db64cea7f..8a3754a9e7f 100644--- a/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/AutomaticDashboardApp.module.css+++ b/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/AutomaticDashboardApp.module.css@@ -10,7 +10,7 @@.SuggestionsSidebarWrapper {min-height: 100%;width: 346px;- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);border-left: 2px solid var(--mb-color-border);}@@ -23,7 +23,7 @@}.Root {- background: var(--mb-color-background-light);+ background: var(--mb-color-background-secondary);min-height: 100%;display: flex;flex-direction: column;diff --git a/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/SuggestionsSidebar.tsx b/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/SuggestionsSidebar.tsxindex ee060093825..60408e9ee82 100644--- a/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/SuggestionsSidebar.tsx+++ b/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/SuggestionsSidebar.tsx@@ -77,7 +77,10 @@ const SuggestionsList = ({<h4 className={CS.textWrap}>{item.title}</h4><Box ml="auto" className={CS.hoverChild}><Tooltip label={item.description}>- <Icon name="info_outline" c="bg-dark" />+ <Icon+ name="info_outline"+ c="background-tertiary-inverse"+ /></Tooltip></Box></Flex>@@ -95,7 +98,7 @@ const SuggestionSectionHeading = ({ children }: PropsWithChildren) => (style={{fontWeight: 900,textTransform: "uppercase",- color: color("text-medium"),+ color: color("text-secondary"),}}className={CS.mb1}>diff --git a/frontend/src/metabase/data-grid/components/AddColumnButton/AddColumnButton.module.css b/frontend/src/metabase/data-grid/components/AddColumnButton/AddColumnButton.module.cssindex 8e9c3d9211d..270c92751b7 100644--- a/frontend/src/metabase/data-grid/components/AddColumnButton/AddColumnButton.module.css+++ b/frontend/src/metabase/data-grid/components/AddColumnButton/AddColumnButton.module.css@@ -3,7 +3,7 @@align-items: center;justify-content: center;z-index: 5;- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);width: 36px;height: 36px;box-sizing: content-box;diff --git a/frontend/src/metabase/data-grid/components/DataGrid/DataGrid.module.css b/frontend/src/metabase/data-grid/components/DataGrid/DataGrid.module.cssindex 02c75d2881c..879e447155f 100644--- a/frontend/src/metabase/data-grid/components/DataGrid/DataGrid.module.css+++ b/frontend/src/metabase/data-grid/components/DataGrid/DataGrid.module.css@@ -1,6 +1,6 @@.table {position: relative;- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);width: 100%;height: 100%;font-size: 12.5px;diff --git a/frontend/src/metabase/data-grid/components/DataGrid/DataGrid.tsx b/frontend/src/metabase/data-grid/components/DataGrid/DataGrid.tsxindex afca50f59c1..7296b1824b4 100644--- a/frontend/src/metabase/data-grid/components/DataGrid/DataGrid.tsx+++ b/frontend/src/metabase/data-grid/components/DataGrid/DataGrid.tsx@@ -142,11 +142,11 @@ export const DataGrid = function DataGrid<TData>({const rowsCount = table.getRowModel().rows.length;const backgroundColor =- theme?.cell?.backgroundColor ?? "var(--mb-color-background)";+ theme?.cell?.backgroundColor ?? "var(--mb-color-background-primary)";const stickyElementsBackgroundColor =theme?.stickyBackgroundColor ??(backgroundColor == null || backgroundColor === "transparent"- ? "var(--mb-color-background)"+ ? "var(--mb-color-background-primary)": backgroundColor);return (diff --git a/frontend/src/metabase/data-grid/components/ExpandButton/ExpandButton.module.css b/frontend/src/metabase/data-grid/components/ExpandButton/ExpandButton.module.cssindex 0546a4abbf6..e5dfa3f59ca 100644--- a/frontend/src/metabase/data-grid/components/ExpandButton/ExpandButton.module.css+++ b/frontend/src/metabase/data-grid/components/ExpandButton/ExpandButton.module.css@@ -21,6 +21,6 @@}.button:hover {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);background-color: var(--mb-color-brand);}diff --git a/frontend/src/metabase/data-grid/components/RowIdCell/RowIdCell.module.css b/frontend/src/metabase/data-grid/components/RowIdCell/RowIdCell.module.cssindex 3ce82219914..0bf6869e159 100644--- a/frontend/src/metabase/data-grid/components/RowIdCell/RowIdCell.module.css+++ b/frontend/src/metabase/data-grid/components/RowIdCell/RowIdCell.module.css@@ -2,7 +2,7 @@height: 100%;padding: 0 0.5rem;text-align: right;- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);display: flex;justify-content: flex-end;cursor: pointer;diff --git a/frontend/src/metabase/data-grid/components/RowIdHeaderCell/RowIdHeaderCell.module.css b/frontend/src/metabase/data-grid/components/RowIdHeaderCell/RowIdHeaderCell.module.cssindex bdb800d8f5a..76c4c2138f7 100644--- a/frontend/src/metabase/data-grid/components/RowIdHeaderCell/RowIdHeaderCell.module.css+++ b/frontend/src/metabase/data-grid/components/RowIdHeaderCell/RowIdHeaderCell.module.css@@ -3,7 +3,7 @@display: flex;align-items: center;padding: 0 0.75em;- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);cursor: default;border-bottom: unset;}diff --git a/frontend/src/metabase/databases/components/DatabaseCacheScheduleField/DatabaseCacheScheduleField.tsx b/frontend/src/metabase/databases/components/DatabaseCacheScheduleField/DatabaseCacheScheduleField.tsxindex 7dff29209f3..b75d884a0fe 100644--- a/frontend/src/metabase/databases/components/DatabaseCacheScheduleField/DatabaseCacheScheduleField.tsx+++ b/frontend/src/metabase/databases/components/DatabaseCacheScheduleField/DatabaseCacheScheduleField.tsx@@ -98,7 +98,7 @@ export const DatabaseCacheScheduleField = ({)}{scheduleMode === "on-demand" && (- <Box c="text-medium" fz="sm" maw={rem(620)} mt="sm">+ <Box c="text-secondary" fz="sm" maw={rem(620)} mt="sm">{/* eslint-disable-next-line no-literal-metabase-strings -- Metabase settings */}{t`When a user adds a new filter to a dashboard or a SQL question, Metabase will scan the field(s) mapped to that filter in order to show the list of selectable values.`}</Box>diff --git a/frontend/src/metabase/databases/components/DatabaseConnectionSectionField/DatabaseConnectionSectionField.tsx b/frontend/src/metabase/databases/components/DatabaseConnectionSectionField/DatabaseConnectionSectionField.tsxindex b2909862ef2..9e6646c2ba0 100644--- a/frontend/src/metabase/databases/components/DatabaseConnectionSectionField/DatabaseConnectionSectionField.tsx+++ b/frontend/src/metabase/databases/components/DatabaseConnectionSectionField/DatabaseConnectionSectionField.tsx@@ -23,7 +23,7 @@ export const DatabaseConnectionSectionField = ({return (<FormField><Box- bg="var(--mb-color-background-info)"+ bg="background-info"p="lg"style={{ borderRadius: "var(--default-border-radius)" }}>diff --git a/frontend/src/metabase/databases/components/DatabaseConnectionUri/DatabaseConnectionStringField.tsx b/frontend/src/metabase/databases/components/DatabaseConnectionUri/DatabaseConnectionStringField.tsxindex d5e750c7bf4..a58974083fc 100644--- a/frontend/src/metabase/databases/components/DatabaseConnectionUri/DatabaseConnectionStringField.tsx+++ b/frontend/src/metabase/databases/components/DatabaseConnectionUri/DatabaseConnectionStringField.tsx@@ -185,7 +185,7 @@ function ConnectionStringDescription({component="span"><Group gap="xs" component="span">- <Icon name="warning_round_filled" c="var(--mb-color-danger)" />+ <Icon name="warning_round_filled" c="danger" />{t`Couldn’t use this connection string.`}</Group></Text>diff --git a/frontend/src/metabase/databases/components/DatabaseEngineList/DatabaseEngineList.module.css b/frontend/src/metabase/databases/components/DatabaseEngineList/DatabaseEngineList.module.cssindex 7b4f37ab857..47165469a90 100644--- a/frontend/src/metabase/databases/components/DatabaseEngineList/DatabaseEngineList.module.css+++ b/frontend/src/metabase/databases/components/DatabaseEngineList/DatabaseEngineList.module.css@@ -31,9 +31,9 @@}.noResultsIcon {- background-color: var(--mb-color-bg-medium);+ background-color: var(--mb-color-background-tertiary);border-radius: 100%;- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);}.sampleDbIndicator {diff --git a/frontend/src/metabase/databases/components/DatabaseEngineList/DatabaseEngineList.tsx b/frontend/src/metabase/databases/components/DatabaseEngineList/DatabaseEngineList.tsxindex 55bc15436b4..2ca663382ef 100644--- a/frontend/src/metabase/databases/components/DatabaseEngineList/DatabaseEngineList.tsx+++ b/frontend/src/metabase/databases/components/DatabaseEngineList/DatabaseEngineList.tsx@@ -174,7 +174,7 @@ const NoDatabaseFound = ({ isSetupStep }: { isSetupStep?: boolean }) => {align="center"pt="lg"maw="22.5rem"- c="text-medium"+ c="text-secondary"m="0 auto"><Center className={S.noResultsIcon} w="3rem" h="3rem">@@ -229,7 +229,7 @@ const SampleDatabaseIndicator = () => {{t`Sample Database for testing`}</Text>{/* eslint-disable-next-line no-literal-metabase-strings -- only shown to admins during setup */}- <Text inline c="text-light">{t`(by Metabase)`}</Text>+ <Text inline c="text-tertiary">{t`(by Metabase)`}</Text></Flex><Group gap="xs"><Icon name="check_filled" c="success" />diff --git a/frontend/src/metabase/databases/components/DatabaseHostnameWithProviderField/ProviderIcon.tsx b/frontend/src/metabase/databases/components/DatabaseHostnameWithProviderField/ProviderIcon.tsxindex 2e4bc1bc195..cde9049e585 100644--- a/frontend/src/metabase/databases/components/DatabaseHostnameWithProviderField/ProviderIcon.tsx+++ b/frontend/src/metabase/databases/components/DatabaseHostnameWithProviderField/ProviderIcon.tsx@@ -26,12 +26,7 @@ export function ProviderIcon({}) {if (!provider) {return (- <Icon- name="database"- size={ICON_SIZE}- color="icon-primary"- opacity={0.25}- />+ <Icon name="database" size={ICON_SIZE} c="icon-primary" opacity={0.25} />);}diff --git a/frontend/src/metabase/databases/components/DatabaseInfoField/DatabaseInfoField.tsx b/frontend/src/metabase/databases/components/DatabaseInfoField/DatabaseInfoField.tsxindex 7c412f6faec..d530cbbccdb 100644--- a/frontend/src/metabase/databases/components/DatabaseInfoField/DatabaseInfoField.tsx+++ b/frontend/src/metabase/databases/components/DatabaseInfoField/DatabaseInfoField.tsx@@ -10,8 +10,8 @@ const DatabaseInfoField = ({}: DatabaseInfoFieldProps): JSX.Element | null => {return placeholder ? (<Flex- bg="bg-light"- c="text-medium"+ bg="background-secondary"+ c="text-secondary"data-testid="app-banner"mb="sm"p="0.75rem"diff --git a/frontend/src/metabase/detail-view/components/DetailViewPage/DetailViewPage.tsx b/frontend/src/metabase/detail-view/components/DetailViewPage/DetailViewPage.tsxindex 10c8b56d54f..bc0ca242567 100644--- a/frontend/src/metabase/detail-view/components/DetailViewPage/DetailViewPage.tsx+++ b/frontend/src/metabase/detail-view/components/DetailViewPage/DetailViewPage.tsx@@ -57,14 +57,14 @@ export function DetailViewPage({return (<Stack- bg="var(--mb-color-background-light)"+ bg="background-secondary"data-testid="object-detail"gap={0}mih="100%">{headerColumns.length > 0 && (<Box- bg="bg-white"+ bg="background-primary"className={S.header}pl={rem(paddingLeft)}pr="xl"@@ -89,7 +89,7 @@ export function DetailViewPage({><Groupalign="flex-start"- bg="bg-white"+ bg="background-primary"flex="1"p="xl"pl={rem(paddingLeft)}diff --git a/frontend/src/metabase/detail-view/components/DetailViewSidesheet/DetailViewSidesheet.tsx b/frontend/src/metabase/detail-view/components/DetailViewSidesheet/DetailViewSidesheet.tsxindex d606f565123..418e80aa40c 100644--- a/frontend/src/metabase/detail-view/components/DetailViewSidesheet/DetailViewSidesheet.tsx+++ b/frontend/src/metabase/detail-view/components/DetailViewSidesheet/DetailViewSidesheet.tsx@@ -239,7 +239,7 @@ export function DetailViewSidesheet({<Tooltip disabled={!onPreviousClick} label={t`Previous row`}><Buttonaria-label={t`Previous row`}- c="text-dark"+ c="text-primary"disabled={!onPreviousClick}h={20}leftSection={<Icon name="chevronup" />}@@ -256,7 +256,7 @@ export function DetailViewSidesheet({<Tooltip disabled={!onNextClick} label={t`Next row`}><Buttonaria-label={t`Next row`}- c="text-dark"+ c="text-primary"disabled={!onNextClick}h={20}leftSection={<Icon name="chevrondown" />}@@ -281,7 +281,7 @@ export function DetailViewSidesheet({<Tooltip label={t`Actions`}><Buttonaria-label={t`Actions`}- c="text-dark"+ c="text-primary"data-testid="actions-menu"h={20}leftSection={<Icon name="ellipsis" />}@@ -304,7 +304,7 @@ export function DetailViewSidesheet({aria-label={linkCopied ? t`Copied!` : t`Copy link to this record`}- c="text-dark"+ c="text-primary"h={20}leftSection={<Icon name="link" />}p={0}@@ -318,7 +318,7 @@ export function DetailViewSidesheet({<Box><Buttonaria-label={t`Open in full page`}- c="text-dark"+ c="text-primary"component={Link}h={20}leftSection={<Icon name="expand" />}@@ -365,12 +365,7 @@ export function DetailViewSidesheet({hasPk &&tableForeignKeys &&tableForeignKeys.length > 0 && (- <Box- flex="1"- bg="var(--mb-color-background-light)"- px={rem(56)}- py={rem(48)}- >+ <Box flex="1" bg="background-secondary" px={rem(56)} py={rem(48)}><RelationshipsrowId={rowId}rowName={rowName}diff --git a/frontend/src/metabase/detail-view/components/DetailViewSidesheet/Sidesheet/Sidesheet.tsx b/frontend/src/metabase/detail-view/components/DetailViewSidesheet/Sidesheet/Sidesheet.tsxindex c9016a53a9c..048cfbd0ef1 100644--- a/frontend/src/metabase/detail-view/components/DetailViewSidesheet/Sidesheet/Sidesheet.tsx+++ b/frontend/src/metabase/detail-view/components/DetailViewSidesheet/Sidesheet/Sidesheet.tsx@@ -45,7 +45,7 @@ export function Sidesheet({<Tooltip label={t`Close`}><Buttonaria-label={t`Close`}- c="text-dark"+ c="text-primary"h={20}leftSection={<Icon name="close" />}p={0}diff --git a/frontend/src/metabase/detail-view/components/DetailsGroup/Value/Value.module.css b/frontend/src/metabase/detail-view/components/DetailsGroup/Value/Value.module.cssindex a5603aced6b..42c3c540f0a 100644--- a/frontend/src/metabase/detail-view/components/DetailsGroup/Value/Value.module.css+++ b/frontend/src/metabase/detail-view/components/DetailsGroup/Value/Value.module.css@@ -36,7 +36,7 @@.json {max-height: 200px;width: 100%;- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);border: 1px solid var(--mb-color-border);border-radius: 4px;}diff --git a/frontend/src/metabase/detail-view/components/DetailsGroup/Value/Value.tsx b/frontend/src/metabase/detail-view/components/DetailsGroup/Value/Value.tsxindex 26dbb628e3c..f1dcf6370be 100644--- a/frontend/src/metabase/detail-view/components/DetailsGroup/Value/Value.tsx+++ b/frontend/src/metabase/detail-view/components/DetailsGroup/Value/Value.tsx@@ -32,7 +32,7 @@ export const Value = ({ children, column, field, value }: Props) => {const json = useMemo(() => getJson(column, value), [column, value]);if (isEmptyValue) {- return <Text c="text-light">{t`empty`}</Text>;+ return <Text c="text-tertiary">{t`empty`}</Text>;}if (json) {@@ -49,7 +49,7 @@ export const Value = ({ children, column, field, value }: Props) => {if (isFK(column) && newTableId != null && !isValidLink) {return (<Text- bg="var(--mb-color-bg-light)"+ bg="background-secondary"c="text-primary"className={S.fk}component={Link}@@ -67,7 +67,7 @@ export const Value = ({ children, column, field, value }: Props) => {return (<Stack className={S.value} gap="sm" align="flex-start"><Box- bg="var(--mb-color-background-light)"+ bg="background-secondary"className={S.imageFrame}mah={FRAME_SIZE}maw={FRAME_SIZE}diff --git a/frontend/src/metabase/detail-view/components/Header/Header.module.css b/frontend/src/metabase/detail-view/components/Header/Header.module.cssindex 95753d108e7..d337d9568cb 100644--- a/frontend/src/metabase/detail-view/components/Header/Header.module.css+++ b/frontend/src/metabase/detail-view/components/Header/Header.module.css@@ -1,5 +1,5 @@.avatarFrame {- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);border: 1px solid var(--mb-color-border);border-radius: 50%;overflow: hidden;diff --git a/frontend/src/metabase/detail-view/components/Relationships/Relationship/Relationship.module.css b/frontend/src/metabase/detail-view/components/Relationships/Relationship/Relationship.module.cssindex 79701f4d2de..473afa5ba8c 100644--- a/frontend/src/metabase/detail-view/components/Relationships/Relationship/Relationship.module.css+++ b/frontend/src/metabase/detail-view/components/Relationships/Relationship/Relationship.module.css@@ -1,5 +1,5 @@.clickable {- color: var(--mb-color-text-dark) !important;+ color: var(--mb-color-text-primary) !important;&:hover {.text {diff --git a/frontend/src/metabase/detail-view/components/Relationships/Relationship/Relationship.tsx b/frontend/src/metabase/detail-view/components/Relationships/Relationship/Relationship.tsxindex 40153beed59..20c3baa4abf 100644--- a/frontend/src/metabase/detail-view/components/Relationships/Relationship/Relationship.tsx+++ b/frontend/src/metabase/detail-view/components/Relationships/Relationship/Relationship.tsx@@ -77,7 +77,7 @@ export const Relationship = ({ fk, rowId, onClick }: Props) => {{!isFetching && (<Text- c={count === 0 ? "text-light" : "text-medium"}+ c={count === 0 ? "text-tertiary" : "text-secondary"}className={S.text}fw="bold"fz={rem(24)}@@ -88,7 +88,7 @@ export const Relationship = ({ fk, rowId, onClick }: Props) => {)}<Text- c={count === 0 ? "text-light" : "text-medium"}+ c={count === 0 ? "text-tertiary" : "text-secondary"}className={S.text}fw="bold"lh={1}diff --git a/frontend/src/metabase/documents/components/CommentsSidesheet/CommentsSidesheet.module.css b/frontend/src/metabase/documents/components/CommentsSidesheet/CommentsSidesheet.module.cssindex 1b5ce9f4a46..618062aaa86 100644--- a/frontend/src/metabase/documents/components/CommentsSidesheet/CommentsSidesheet.module.css+++ b/frontend/src/metabase/documents/components/CommentsSidesheet/CommentsSidesheet.module.css@@ -25,7 +25,7 @@position: sticky;top: 0;z-index: 2;- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);}.tabPanel {diff --git a/frontend/src/metabase/documents/components/CommentsSidesheet/CommentsSidesheet.tsx b/frontend/src/metabase/documents/components/CommentsSidesheet/CommentsSidesheet.tsxindex f19cd952247..be1eee67bf8 100644--- a/frontend/src/metabase/documents/components/CommentsSidesheet/CommentsSidesheet.tsx+++ b/frontend/src/metabase/documents/components/CommentsSidesheet/CommentsSidesheet.tsx@@ -173,7 +173,7 @@ export const CommentsSidesheet = ({ params, onClose }: Props) => {if (error) {sendToast({icon: "warning_triangle_filled",- iconColor: "var(--mb-color-warning)",+ iconColor: "warning",message: t`Failed to send comment`,});} else {@@ -245,7 +245,7 @@ export const CommentsSidesheet = ({ params, onClose }: Props) => {><Image w={120} h={120} src={noResultsSource} />- <Text fw="700" c="text-light">{t`No comments`}</Text>+ <Text fw="700" c="text-tertiary">{t`No comments`}</Text></Flex>)}diff --git a/frontend/src/metabase/documents/components/DocumentPage.module.css b/frontend/src/metabase/documents/components/DocumentPage.module.cssindex 87ea25d92b0..8bdb0fc7328 100644--- a/frontend/src/metabase/documents/components/DocumentPage.module.css+++ b/frontend/src/metabase/documents/components/DocumentPage.module.css@@ -2,7 +2,7 @@display: flex;flex-direction: column;height: 100%;- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);}.header {@@ -10,7 +10,7 @@align-items: flex-start;justify-content: space-between;padding: 1rem 0;- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);gap: 1rem;max-width: 900px;margin: 0 auto;@@ -82,7 +82,7 @@.sidebar {width: 360px;flex-shrink: 0;- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);border-left: 1px solid var(--mb-color-border);overflow-y: auto;}@@ -95,7 +95,7 @@}.cardEmbed:hover {- background-color: var(--mb-color-bg-medium);+ background-color: var(--mb-color-background-tertiary);}.highlighted {diff --git a/frontend/src/metabase/documents/components/Editor/Editor.module.css b/frontend/src/metabase/documents/components/Editor/Editor.module.cssindex 73659fd1d60..5259a969715 100644--- a/frontend/src/metabase/documents/components/Editor/Editor.module.css+++ b/frontend/src/metabase/documents/components/Editor/Editor.module.css@@ -20,7 +20,7 @@padding: 1.5rem 0 2rem 0;min-height: 100%;outline: none;- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);font-size: 1rem;line-height: 1.5;}@@ -32,7 +32,7 @@:global(.editor-style-boundary) *) {font-weight: 700;- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);}.editorContent@@ -133,20 +133,20 @@.editorContent:global(.ProseMirror):global(code):not(:global(.editor-style-boundary) *) {- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);padding: 0.125rem 0.375rem;border-radius: var(--mantine-radius-xs);font-family: var(--mb-default-monospace-font-family, monospace);font-size: 0.875rem;- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);border: 1px solid var(--mb-color-border);}.editorContent:global(.ProseMirror):global(pre):not(:global(.editor-style-boundary) *) {- background-color: var(--mb-color-bg-light);- color: var(--mb-color-text-dark);+ background-color: var(--mb-color-background-secondary);+ color: var(--mb-color-text-primary);padding: 1rem;border-radius: var(--mantine-radius-sm);overflow-x: auto;@@ -170,9 +170,9 @@:global(blockquote):not(:global(.editor-style-boundary) *) {border-left: 3px solid var(--mb-color-border);margin: 0 0 1rem 0;- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);font-style: italic;- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);padding: 1rem;padding-left: 1.25rem;border-radius: var(--mantine-radius-xs);@@ -192,7 +192,7 @@.editorContent :global(.is-empty:first-child:before),.editorContent :global(.node-paragraph.is-empty:first-child:before) {- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);content: attr(data-placeholder);float: left;height: 0;diff --git a/frontend/src/metabase/documents/components/Editor/shared/MenuComponents.tsx b/frontend/src/metabase/documents/components/Editor/shared/MenuComponents.tsxindex 2f09fcf51fa..d90ada46d6d 100644--- a/frontend/src/metabase/documents/components/Editor/shared/MenuComponents.tsx+++ b/frontend/src/metabase/documents/components/Editor/shared/MenuComponents.tsx@@ -1,6 +1,7 @@import type { DOMAttributes, MouseEvent } from "react";import { t } from "ttag";+import type { ColorName } from "metabase/lib/colors/types";import type { SuggestionModel } from "metabase/rich_text_editing/tiptap/extensions/shared/types";import {Avatar,@@ -21,7 +22,7 @@ interface ExtraItemProps extends DOMAttributes<HTMLButtonElement> {export interface MenuItem {icon: IconName;- iconColor?: string;+ iconColor?: ColorName;label: string;description?: string;action: () => void;@@ -52,7 +53,7 @@ export const MenuItemComponent = ({{item.model === "user" && <Avatar name={item.label} size={16} />}{item.model !== "user" && (- <Icon name={item.icon} size={16} color={item.iconColor || "inherit"} />+ <Icon name={item.icon} size={16} c={item.iconColor || "inherit"} />)}<Stack gap={2} className={S.menuItemStack}>@@ -60,14 +61,14 @@ export const MenuItemComponent = ({{item.label}</Text>{item.description && (- <Text size="sm" c="text-light" lh="md">+ <Text size="sm" c="text-tertiary" lh="md">{item.description}</Text>)}</Stack>{item.hasSubmenu && (- <Icon name="chevronright" size=".75rem" color="text-light" />+ <Icon name="chevronright" size=".75rem" c="text-tertiary" />)}</Group></UnstyledButton>@@ -122,7 +123,7 @@ export const MetabotFooter = ({ isSelected, onClick }: ExtraItemProps) => (<Icon name="metabot" size={16} color="inherit" /><Stack gap={2}><Text size="md" lh="lg" c="inherit">{t`Ask Metabot`}</Text>- <Text size="sm" c="text-light" lh="md">+ <Text size="sm" c="text-tertiary" lh="md">{t`It wants to help!`}</Text></Stack>diff --git a/frontend/src/metabase/documents/components/EmbedQuestionSettingsSidebar.module.css b/frontend/src/metabase/documents/components/EmbedQuestionSettingsSidebar.module.cssindex 0d2da6991c1..7caddc3d4da 100644--- a/frontend/src/metabase/documents/components/EmbedQuestionSettingsSidebar.module.css+++ b/frontend/src/metabase/documents/components/EmbedQuestionSettingsSidebar.module.css@@ -3,12 +3,12 @@display: flex;align-items: stretch;flex-direction: column;- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);}.header {border-bottom: 1px solid var(--mb-color-border);- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);}.loadingContainer {@@ -43,5 +43,5 @@.footer {border-top: 1px solid var(--mb-color-border);padding: var(--mantine-spacing-md);- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);}diff --git a/frontend/src/metabase/documents/components/EmbedQuestionSettingsSidebar.tsx b/frontend/src/metabase/documents/components/EmbedQuestionSettingsSidebar.tsxindex 799b0502a71..2773ee64c93 100644--- a/frontend/src/metabase/documents/components/EmbedQuestionSettingsSidebar.tsx+++ b/frontend/src/metabase/documents/components/EmbedQuestionSettingsSidebar.tsx@@ -179,7 +179,7 @@ export const EmbedQuestionSettingsSidebar = ({<ActionIconmt="1rem"mr="1rem"- color="text-dark"+ color="text-primary"onClick={handleDone}><Icon name="close" />diff --git a/frontend/src/metabase/embedding-sdk/theme/default-component-theme.ts b/frontend/src/metabase/embedding-sdk/theme/default-component-theme.tsindex dcc3bb7ae16..f71e0d63047 100644--- a/frontend/src/metabase/embedding-sdk/theme/default-component-theme.ts+++ b/frontend/src/metabase/embedding-sdk/theme/default-component-theme.ts@@ -34,9 +34,9 @@ export const DEFAULT_METABASE_COMPONENT_THEME: MetabaseComponentTheme = {collectionBrowser: {breadcrumbs: {expandButton: {- textColor: "var(--mb-color-text-medium)",- backgroundColor: "var(--mb-color-bg-light)",- hoverTextColor: "var(--mb-color-text-white)",+ textColor: "var(--mb-color-text-secondary)",+ backgroundColor: "var(--mb-color-background-secondary)",+ hoverTextColor: "var(--mb-color-text-primary-inverse)",hoverBackgroundColor: "var(--mb-color-brand)",},},@@ -54,9 +54,9 @@ export const DEFAULT_METABASE_COMPONENT_THEME: MetabaseComponentTheme = {},},dashboard: {- backgroundColor: "var(--mb-color-bg-white)",+ backgroundColor: "var(--mb-color-background-primary)",card: {- backgroundColor: "var(--mb-color-bg-white)",+ backgroundColor: "var(--mb-color-background-primary)",},},question: {@@ -77,8 +77,8 @@ export const DEFAULT_METABASE_COMPONENT_THEME: MetabaseComponentTheme = {fontSize: FONT_SIZES.pivotTableCell.px,},rowToggle: {- textColor: "text-white",- backgroundColor: "text-light", // TODO: should it be "bg-dark" ?+ textColor: "text-primary-inverse",+ backgroundColor: "text-tertiary", // TODO: should it be "background-tertiary-inverse" ?},},cartesian: {@@ -126,7 +126,7 @@ export const DEFAULT_EMBEDDED_COMPONENT_THEME: MetabaseComponentTheme = merge<breadcrumbs: {expandButton: {backgroundColor: "transparent",- hoverTextColor: "var(--mb-color-text-white)",+ hoverTextColor: "var(--mb-color-text-primary-inverse)",hoverBackgroundColor: "var(--mb-color-brand)",},},diff --git a/frontend/src/metabase/embedding-sdk/theme/dynamic-css-vars-config.ts b/frontend/src/metabase/embedding-sdk/theme/dynamic-css-vars-config.tsindex ad25a13d32b..355f2179093 100644--- a/frontend/src/metabase/embedding-sdk/theme/dynamic-css-vars-config.ts+++ b/frontend/src/metabase/embedding-sdk/theme/dynamic-css-vars-config.ts@@ -20,7 +20,7 @@ export const DYNAMIC_CSS_VARIABLES: DynamicCssVarConfig = {"--mb-color-background-hover": {dark: { source: "background", lighten: 0.5 },},- "--mb-color-bg-error": {+ "--mb-color-background-error": {dark: { source: "negative", alpha: 0.1 },},"--mb-color-cartesian-grid-line": {diff --git a/frontend/src/metabase/embedding-sdk/theme/dynamic-css-vars.ts b/frontend/src/metabase/embedding-sdk/theme/dynamic-css-vars.tsindex e4b4c7d7253..e88f2dad9d5 100644--- a/frontend/src/metabase/embedding-sdk/theme/dynamic-css-vars.ts+++ b/frontend/src/metabase/embedding-sdk/theme/dynamic-css-vars.ts@@ -41,8 +41,8 @@ export function applyColorOperation(* Determine if the current color scheme is dark based on the palette.*/export function getIsDarkThemeFromPalette(theme: MantineThemeOverride) {- const backgroundColor = theme.fn?.themeColor?.("background");- const foregroundColor = theme.fn?.themeColor?.("text-dark");+ const backgroundColor = theme.fn?.themeColor?.("background-primary");+ const foregroundColor = theme.fn?.themeColor?.("text-primary");// Dark background color indicates a dark theme.if (isColorDefined(backgroundColor)) {diff --git a/frontend/src/metabase/embedding-sdk/theme/embedding-color-palette.ts b/frontend/src/metabase/embedding-sdk/theme/embedding-color-palette.tsindex 11badfae7bd..ee86d855ce3 100644--- a/frontend/src/metabase/embedding-sdk/theme/embedding-color-palette.ts+++ b/frontend/src/metabase/embedding-sdk/theme/embedding-color-palette.ts@@ -17,23 +17,6 @@ import { getEmbeddingChartColors } from "./get-embedding-chart-colors";*/export type MappableSdkColor = Exclude<MetabaseColor, "charts">;-export type SemanticColorKey =- | "text-primary"- | "text-secondary"- | "text-tertiary"- | "text-selected"- | "text-brand"- | "text-white"- | "background"- | "background-hover"- | "background-selected"- | "background-disabled"- | "background-inverse"- | "background-light"- | "background-brand"- | "brand-light"- | "brand-lighter";-/*** Mapping of SDK colors to main app colors.*@@ -42,7 +25,7 @@ export type SemanticColorKey =*/export const SDK_TO_MAIN_APP_COLORS_MAPPING: Record<MappableSdkColor,- (ColorName | SemanticColorKey)[]+ ColorName[]> = {brand: ["brand"],"brand-hover": ["brand-light"],@@ -50,20 +33,20 @@ export const SDK_TO_MAIN_APP_COLORS_MAPPING: Record<border: ["border"],filter: ["filter"],summarize: ["summarize"],- "text-primary": ["text-dark", "text-primary"],- "text-secondary": ["text-medium", "text-secondary"],- "text-tertiary": ["text-light", "text-tertiary"],- background: ["bg-white", "bg-primary", "background"],- "background-hover": ["bg-light", "background-hover"],- "background-secondary": ["bg-medium", "bg-secondary"],+ "text-primary": ["text-primary"],+ "text-secondary": ["text-secondary"],+ "text-tertiary": ["text-tertiary"],+ background: ["background-primary"],+ "background-secondary": ["background-secondary", "background-tertiary"],+ "background-hover": ["background-secondary"],"background-disabled": ["background-disabled"],- "background-light": ["background-light"],+ "background-light": ["background-secondary"],shadow: ["shadow"],positive: ["success"],negative: ["danger"],- "text-white": ["text-white", "white"],+ "text-white": ["text-primary-inverse", "white"],error: ["error"],- "background-error": ["bg-error"],+ "background-error": ["background-error"],"text-hover": ["text-hover"],focus: ["focus"],};@@ -82,9 +65,7 @@ export const SDK_MISSING_COLORS_FALLBACK: Partial<* These colors must never be changed.* For example, the blue Metabase brand color.**/-export const SDK_UNCHANGEABLE_COLORS: (ColorName | SemanticColorKey)[] = [- "metabase-brand",-];+export const SDK_UNCHANGEABLE_COLORS: ColorName[] = ["metabase-brand"];export const SDK_TO_MAIN_APP_TOOLTIP_COLORS_MAPPING: Record<keyof NonNullable<MetabaseComponentTheme["tooltip"]>,diff --git a/frontend/src/metabase/embedding/components/ArchiveButton.module.css b/frontend/src/metabase/embedding/components/ArchiveButton.module.cssindex 2265463a44f..5d8b78b9769 100644--- a/frontend/src/metabase/embedding/components/ArchiveButton.module.css+++ b/frontend/src/metabase/embedding/components/ArchiveButton.module.css@@ -3,6 +3,6 @@&:hover:not([data-css-specificity-hack]) {color: var(--mb-color-danger);- background-color: var(--mb-color-bg-error);+ background-color: var(--mb-color-background-error);}}diff --git a/frontend/src/metabase/embedding/components/PublicLinkPopover/DocumentPublicLinkPopover.tsx b/frontend/src/metabase/embedding/components/PublicLinkPopover/DocumentPublicLinkPopover.tsxindex f13ffa7e34a..928c716e9ea 100644--- a/frontend/src/metabase/embedding/components/PublicLinkPopover/DocumentPublicLinkPopover.tsx+++ b/frontend/src/metabase/embedding/components/PublicLinkPopover/DocumentPublicLinkPopover.tsx@@ -83,7 +83,11 @@ export const DocumentPublicLinkPopover = ({data-testid="public-link-popover-content"mih="10rem">- <Title c="text-medium" order={4} mb="md">{t`Public sharing`}</Title>+ <Title+ c="text-secondary"+ order={4}+ mb="md"+ >{t`Public sharing`}</Title><DocumentPublicLinkPopoverContenturl={url}loading={loading}diff --git a/frontend/src/metabase/embedding/components/PublicLinkPopover/DocumentPublicLinkPopoverContent.module.css b/frontend/src/metabase/embedding/components/PublicLinkPopover/DocumentPublicLinkPopoverContent.module.cssindex 8f974210447..79496153e0c 100644--- a/frontend/src/metabase/embedding/components/PublicLinkPopover/DocumentPublicLinkPopoverContent.module.css+++ b/frontend/src/metabase/embedding/components/PublicLinkPopover/DocumentPublicLinkPopoverContent.module.css@@ -8,7 +8,7 @@.embedCodeContainer {position: relative;- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);border-radius: 4px;padding: 0.5rem;}diff --git a/frontend/src/metabase/embedding/components/PublicLinkPopover/DocumentPublicLinkPopoverContent.tsx b/frontend/src/metabase/embedding/components/PublicLinkPopover/DocumentPublicLinkPopoverContent.tsxindex 85dc778b8a0..1a6b7fa26fa 100644--- a/frontend/src/metabase/embedding/components/PublicLinkPopover/DocumentPublicLinkPopoverContent.tsx+++ b/frontend/src/metabase/embedding/components/PublicLinkPopover/DocumentPublicLinkPopoverContent.tsx@@ -45,7 +45,7 @@ export const DocumentPublicLinkPopoverContent = ({return (<Stack gap="md"><Box>- <Text size="sm" c="text-medium" mb="xs">+ <Text size="sm" c="text-secondary" mb="xs">{t`Anyone can view this if you give them the link or embed it.`}</Text></Box>@@ -79,7 +79,7 @@ export const DocumentPublicLinkPopoverContent = ({<Tabs.Panel value="embed" pt="md"><Stack gap="sm"><Box>- <Text size="sm" c="text-medium" mb="xs">+ <Text size="sm" c="text-secondary" mb="xs">{t`Paste this code in your website or blog to embed the document. The iframe will automatically adjust to the document's height.`}</Text></Box>diff --git a/frontend/src/metabase/embedding/components/PublicLinkPopover/PublicLinkCopyPanel.tsx b/frontend/src/metabase/embedding/components/PublicLinkPopover/PublicLinkCopyPanel.tsxindex 146c7b910c1..71eecfd965e 100644--- a/frontend/src/metabase/embedding/components/PublicLinkPopover/PublicLinkCopyPanel.tsx+++ b/frontend/src/metabase/embedding/components/PublicLinkPopover/PublicLinkCopyPanel.tsx@@ -85,7 +85,7 @@ export const PublicLinkCopyPanel = ({data-testid="extension-option"key={extension}tt="uppercase"- c={extension === selectedExtension ? "brand" : "text-light"}+ c={extension === selectedExtension ? "brand" : "text-tertiary"}fw={700}onClick={() =>onChangeExtension?.(diff --git a/frontend/src/metabase/embedding/components/PublicLinkPopover/PublicLinkPopover.tsx b/frontend/src/metabase/embedding/components/PublicLinkPopover/PublicLinkPopover.tsxindex a276e0fe7d2..0836d744bb4 100644--- a/frontend/src/metabase/embedding/components/PublicLinkPopover/PublicLinkPopover.tsx+++ b/frontend/src/metabase/embedding/components/PublicLinkPopover/PublicLinkPopover.tsx@@ -71,9 +71,9 @@ export const PublicLinkPopover = ({data-testid="public-link-popover-content"mih={getMinDropdownHeight()}>- <Title c="text-medium" order={4}>{t`Public link`}</Title>+ <Title c="text-secondary" order={4}>{t`Public link`}</Title><Text- color="text-medium"+ color="text-secondary"size="sm"mb="xs">{t`Anyone can view this if you give them the link.`}</Text>diff --git a/frontend/src/metabase/embedding/embedding-hub/components/EmbeddingHubAdminSettingsPage.tsx b/frontend/src/metabase/embedding/embedding-hub/components/EmbeddingHubAdminSettingsPage.tsxindex 1b1181fd45a..1bb063e94fb 100644--- a/frontend/src/metabase/embedding/embedding-hub/components/EmbeddingHubAdminSettingsPage.tsx+++ b/frontend/src/metabase/embedding/embedding-hub/components/EmbeddingHubAdminSettingsPage.tsx@@ -15,12 +15,9 @@ export const EmbeddingHubAdminSettingsPage = () => {return (<Stack mx="auto" py="xl" gap="xl" maw={800}><Stack gap="xs">- <Title- order={1}- c="var(--mb-color-text-primary)"- >{t`Embedding setup guide`}</Title>+ <Title order={1} c="text-primary">{t`Embedding setup guide`}</Title>- <Text c="var(--mb-color-text-secondary)">{t`Follow the guide to get started with modular embedding`}</Text>+ <Text c="text-secondary">{t`Follow the guide to get started with modular embedding`}</Text></Stack><EmbeddingHub />diff --git a/frontend/src/metabase/embedding/embedding-hub/components/StepperWithCards/StepperWithCards.module.css b/frontend/src/metabase/embedding/embedding-hub/components/StepperWithCards/StepperWithCards.module.cssindex eccade9fdf2..e65aa8c729f 100644--- a/frontend/src/metabase/embedding/embedding-hub/components/StepperWithCards/StepperWithCards.module.css+++ b/frontend/src/metabase/embedding/embedding-hub/components/StepperWithCards/StepperWithCards.module.css@@ -18,14 +18,14 @@}.step:not(.stepDone) .stepIcon {- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);border-color: transparent;background: var(--mb-color-focus);}.step.stepDone .stepIcon {- color: var(--mb-color-bg-white);- background: var(--mb-color-success-darker);+ color: var(--mb-color-background-primary);+ background: var(--mb-color-success-secondary);/** Prevent blue border color from affecting the done icon */border-color: transparent;@@ -63,7 +63,7 @@.lockedStepCard {cursor: not-allowed;- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);}.stepCard:not(.lockedStepCard):hover {diff --git a/frontend/src/metabase/embedding/embedding-hub/components/StepperWithCards/StepperWithCards.tsx b/frontend/src/metabase/embedding/embedding-hub/components/StepperWithCards/StepperWithCards.tsxindex dd2a18df435..67021e0461a 100644--- a/frontend/src/metabase/embedding/embedding-hub/components/StepperWithCards/StepperWithCards.tsx+++ b/frontend/src/metabase/embedding/embedding-hub/components/StepperWithCards/StepperWithCards.tsx@@ -129,18 +129,14 @@ export const StepperWithCards = ({ steps }: { steps: StepperStep[] }) => {fw="bold"c={card.done- ? "var(--mb-color-text-secondary)"- : "var(--mb-color-text-primary)"+ ? "text-secondary"+ : "text-primary"}>{card.title}</Text>- <Text- c="var(--mb-color-text-secondary)"- size="sm"- lh="lg"- >+ <Text c="text-secondary" size="sm" lh="lg">{card.description}</Text></Stack>@@ -152,13 +148,10 @@ export const StepperWithCards = ({ steps }: { steps: StepperStep[] }) => {<Group gap="xs"><Iconname="check"- c="var(--mb-color-success-darker)"+ c="success-secondary"size={12}/>- <Text- size="sm"- c="var(--mb-color-success-darker)"- >+ <Text size="sm" c="success-secondary">{t`Done`}</Text></Group>@@ -167,23 +160,17 @@ export const StepperWithCards = ({ steps }: { steps: StepperStep[] }) => {<Group gap="xs"><Iconname="lock"- c="var(--mb-color-text-secondary)"+ c="text-secondary"size={12}/>- <Text- c="var(--mb-color-text-secondary)"- fz={12}- >+ <Text c="text-secondary" fz={12}>{t`Complete the other steps to unlock`}</Text></Group>)).with({ optional: true }, () => (- <Text- size="sm"- c="var(--mb-color-text-secondary)"- >+ <Text size="sm" c="text-secondary">{t`Optional`}</Text>))diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/Common/TooltipWarning.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/Common/TooltipWarning.tsxindex 9e1308569f5..81b755b5f80 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/Common/TooltipWarning.tsx+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/Common/TooltipWarning.tsx@@ -43,7 +43,7 @@ export const TooltipWarning = ({<Iconname={"info"}size={14}- c="var(--mb-color-text-secondary)"+ c="text-secondary"cursor="pointer"style={{ flexShrink: 0 }}/>diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/EmbedPreviewLoadingOverlay.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/EmbedPreviewLoadingOverlay.tsxindex 9b219042cad..dfcf956465e 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/EmbedPreviewLoadingOverlay.tsx+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/EmbedPreviewLoadingOverlay.tsx@@ -16,7 +16,7 @@ export const EmbedPreviewLoadingOverlay = ({}return (- <Box pos="absolute" bg={bg ?? "var(--mb-color-bg-white)"} inset={0}>+ <Box pos="absolute" bg={bg ?? "background-primary"} inset={0}><Center h="100%" w="100%" mx="auto"><Loader data-testid="preview-loading-indicator" /></Center>diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/EnableEmbeddingCard.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/EnableEmbeddingCard.tsxindex acef8c1cb9d..91b8b149d50 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/EnableEmbeddingCard.tsx+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/EnableEmbeddingCard.tsx@@ -87,7 +87,7 @@ export const EnableEmbeddingCard = ({return (<Card p="md" mb="md" data-testid="enable-embedding-card"><Stack gap={0}>- <Text fz="md" c="text-dark">+ <Text fz="md" c="text-primary">{title}{!termsAccepted && (<HoverCard position="bottom" withArrow>@@ -95,7 +95,7 @@ export const EnableEmbeddingCard = ({<Iconname="info"size={14}- c="text-medium"+ c="text-secondary"ml="sm"style={{ verticalAlign: "middle" }}/>diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/LegacyStaticEmbeddingAlert.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/LegacyStaticEmbeddingAlert.tsxindex 1c33bde8699..5a1915381b0 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/LegacyStaticEmbeddingAlert.tsx+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/LegacyStaticEmbeddingAlert.tsx@@ -42,7 +42,7 @@ export const LegacyStaticEmbeddingAlert = () => {<Alert color="info" variant="outline"><Flex gap="sm"><Box>- <Icon color="var(--mb-color-text-secondary)" name="info" mt="2px" />+ <Icon color="text-secondary" name="info" mt="2px" /></Box><Stack>diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/MetabotLayoutSetting.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/MetabotLayoutSetting.tsxindex 839a765943e..7247afe71a3 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/MetabotLayoutSetting.tsx+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/MetabotLayoutSetting.tsx@@ -18,7 +18,7 @@ export const MetabotLayoutSetting = () => {<HoverCard position="right-start"><HoverCard.Target>- <Icon name="info" size={14} c="text-medium" cursor="pointer" />+ <Icon name="info" size={14} c="text-secondary" cursor="pointer" /></HoverCard.Target><HoverCard.Dropdown>diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/ParameterSettings/ParameterSettings.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/ParameterSettings/ParameterSettings.tsxindex 46cd20f5f90..1ee5bd4cebf 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/ParameterSettings/ParameterSettings.tsx+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/ParameterSettings/ParameterSettings.tsx@@ -64,7 +64,7 @@ export const ParameterSettings = () => {if (isLoading) {return (- <Text size="sm" c="text-medium">+ <Text size="sm" c="text-secondary">{t`Loading parameters...`}</Text>);@@ -128,7 +128,7 @@ export const ParameterSettings = () => {}return (- <Text size="sm" c="text-light">+ <Text size="sm" c="text-tertiary">{t`Parameters are not available for this ${experience}.`}</Text>);diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeEmbedSetup.module.css b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeEmbedSetup.module.cssindex 69f3871123b..d47e82648ad 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeEmbedSetup.module.css+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeEmbedSetup.module.css@@ -38,7 +38,7 @@.Navigation {padding: 0.5rem 1rem;- background: var(--mb-color-bg-white);+ background: var(--mb-color-background-primary);border-top: 1px solid var(--mb-color-border);}diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SelectEmbedOptionsStep.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SelectEmbedOptionsStep.tsxindex 35995c6ce25..40612d8887b 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SelectEmbedOptionsStep.tsx+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SelectEmbedOptionsStep.tsx@@ -140,11 +140,7 @@ const BehaviorSection = () => {{!hasEmailSetup && !disabledInGuestEmbedding && (<HoverCard><HoverCard.Target>- <Icon- name="info"- size={14}- c="var(--mb-color-text-secondary)"- />+ <Icon name="info" size={14} c="text-secondary" /></HoverCard.Target><HoverCard.Dropdown p="sm"><Text>{c(@@ -156,7 +152,7 @@ const BehaviorSection = () => {><Textdisplay="inline"- c="var(--mb-color-text-brand)"+ c="text-brand"fw="bold">{c("is a link in a sentence 'To allow subscriptions, set up email in admin settings'",@@ -215,7 +211,7 @@ const ParametersSection = () => {{t`Parameters`}</Text>- <Text size="sm" c="text-medium" mb="lg">+ <Text size="sm" c="text-secondary" mb="lg">{experience === "dashboard"? t`Set default values and control visibility`: t`Set default values`}diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SelectEmbedResourceMissingRecents.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SelectEmbedResourceMissingRecents.tsxindex 04b4e089f92..40329e450e6 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SelectEmbedResourceMissingRecents.tsx+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SelectEmbedResourceMissingRecents.tsx@@ -24,18 +24,18 @@ export const SelectEmbedResourceMissingRecents = ({py="xl"data-testid="embed-resource-missing-recents">- <Icon name={embedIcon} size={48} c="text-light" />+ <Icon name={embedIcon} size={48} c="text-tertiary" /><Stack align="center" gap="xs"><Text fw="bold" size="md">{getEmptyStateTitle(experience)}</Text>- <Text size="sm" c="text-medium" ta="center">+ <Text size="sm" c="text-secondary" ta="center">{getEmptyStateDescription(experience)}</Text>- <Text size="sm" c="text-medium" ta="center">+ <Text size="sm" c="text-secondary" ta="center">{getSearchLink(experience, openPicker)}</Text></Stack>diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SelectEmbedResourceRecentItemCard.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SelectEmbedResourceRecentItemCard.tsxindex f5bc3e77c40..9bdb0957393 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SelectEmbedResourceRecentItemCard.tsx+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SelectEmbedResourceRecentItemCard.tsx@@ -41,7 +41,7 @@ export const SelectEmbedResourceRecentItemCard = ({<Text fw="bold">{recentItem.name}</Text>{recentItem.description && (- <Text size="sm" c="text-medium">+ <Text size="sm" c="text-secondary">{recentItem.description}</Text>)}diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SelectEmbedResourceStep.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SelectEmbedResourceStep.tsxindex 20ede1c18a7..176c2bb9e71 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SelectEmbedResourceStep.tsx+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/components/SelectEmbedResourceStep.tsx@@ -124,7 +124,7 @@ export const SelectEmbedResourceStep = () => {return (<Stack gap="md">- <Text c="text-medium" mb="md">+ <Text c="text-secondary" mb="md">{getEmbedDescription(experience)}</Text>diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/derived-colors-for-embed-flow.unit.spec.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/derived-colors-for-embed-flow.unit.spec.tsindex 04944b36c93..48ed69d4825 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/derived-colors-for-embed-flow.unit.spec.ts+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/derived-colors-for-embed-flow.unit.spec.ts@@ -88,8 +88,8 @@ describe("getDerivedDefaultColorsForEmbedFlow", () => {const theme: MetabaseTheme = {};const applicationColors = {- "bg-white": "#2d3030",- "text-dark": "#eee",+ "background-primary": "#2d3030",+ "text-primary": "#eee",};const { colors } = getDerivedDefaultColorsForEmbedFlow({diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/dynamic-sdk-color-defaults.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/dynamic-sdk-color-defaults.tsindex dad999d9105..5364a79674b 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/dynamic-sdk-color-defaults.ts+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/dynamic-sdk-color-defaults.ts@@ -18,10 +18,6 @@ export const EMBED_FLOW_DERIVED_COLORS_CONFIG: EmbedFlowDerivedDefaultColorConfilight: { source: "background", darken: 0.02 },dark: { source: "background", darken: 0.2 },},- "background-light": {- light: { source: "background", darken: 0.02 },- dark: { source: "background", lighten: 0.6 },- },"text-secondary": {light: { source: "text-primary", lighten: 0.3 },dark: { source: "text-primary", darken: 0.3 },diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/theme-colors.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/theme-colors.tsindex 2502c631a41..2d8157a7cd0 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/theme-colors.ts+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/utils/theme-colors.ts@@ -13,12 +13,12 @@ export const getConfigurableThemeColors = () =>{name: t`Text color`,key: "text-primary",- originalColorKey: "text-dark",+ originalColorKey: "text-primary",},{name: t`Background color`,key: "background",- originalColorKey: "bg-white",+ originalColorKey: "background-primary",},] as const satisfies {name: string;diff --git a/frontend/src/metabase/entities/collections/utils.ts b/frontend/src/metabase/entities/collections/utils.tsindex 5037bf343e4..d1a5b958298 100644--- a/frontend/src/metabase/entities/collections/utils.ts+++ b/frontend/src/metabase/entities/collections/utils.ts@@ -5,6 +5,7 @@ import {isSyncedCollection,} from "metabase/collections/utils";import { color } from "metabase/lib/colors";+import type { ColorName } from "metabase/lib/colors/types";import { PLUGIN_COLLECTIONS, PLUGIN_DATA_STUDIO } from "metabase/plugins";import { getUserPersonalCollectionId } from "metabase/selectors/user";import type { IconName, IconProps } from "metabase/ui";@@ -22,7 +23,7 @@ export function getCollectionIcon({ tooltip = "default", isTenantUser = false } = {},): {name: IconName;- color?: string;+ color?: ColorName;tooltip?: string;} {if (collection.id === PERSONAL_COLLECTIONS.id) {diff --git a/frontend/src/metabase/entities/questions.js b/frontend/src/metabase/entities/questions.jsindex 0654d18ff59..77094ab11ea 100644--- a/frontend/src/metabase/entities/questions.js+++ b/frontend/src/metabase/entities/questions.js@@ -164,7 +164,7 @@ export const Questions = createEntity({objectSelectors: {getName: (card) => card && card.name,- getColor: () => color("text-medium"),+ getColor: () => color("text-secondary"),getCollection: (card) => card && normalizedCollection(card.collection),},diff --git a/frontend/src/metabase/forms/components/FormField/FormField.tsx b/frontend/src/metabase/forms/components/FormField/FormField.tsxindex 5b315683944..0547bd6562e 100644--- a/frontend/src/metabase/forms/components/FormField/FormField.tsx+++ b/frontend/src/metabase/forms/components/FormField/FormField.tsx@@ -58,7 +58,7 @@ export const FormField = forwardRef(function FormField({!!optional && !hasError && (<Textcomponent="span"- c={"text-medium"}+ c={"text-secondary"}fw="900"fz="sm"ml="xs"@@ -67,22 +67,22 @@ export const FormField = forwardRef(function FormField({(infoLabel || infoTooltip) && (<Tooltip multiline label={infoTooltip}>{infoLabel ? (- <Text c="text-medium" mb="sm" fz="md" ml="auto">+ <Text c="text-secondary" mb="sm" fz="md" ml="auto">{infoLabel}</Text>) : (- <Icon c="bg-dark" ml="sm" name="info" />+ <Icon c="background-tertiary-inverse" ml="sm" name="info" />)}</Tooltip>)}{actions && (- <Box ml="auto" fz="0.75rem" fw="900" c="text-medium">+ <Box ml="auto" fz="0.75rem" fw="900" c="text-secondary">{actions}</Box>)}</Flex>{description && (- <Text c="text-medium" mb="sm" fz="sm" lh="md">+ <Text c="text-secondary" mb="sm" fz="sm" lh="md">{description}</Text>)}diff --git a/frontend/src/metabase/forms/components/FormTextInput/FormTextInput.styled.tsx b/frontend/src/metabase/forms/components/FormTextInput/FormTextInput.styled.tsxindex b05d36e8a41..2d27ea578a1 100644--- a/frontend/src/metabase/forms/components/FormTextInput/FormTextInput.styled.tsx+++ b/frontend/src/metabase/forms/components/FormTextInput/FormTextInput.styled.tsx@@ -18,7 +18,7 @@ export const CopyWidgetButton = styled(CopyButton)`outline: none;&:hover {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);background-color: var(--mb-color-brand);}`;diff --git a/frontend/src/metabase/home/components/CustomHomePageModal/CustomHomePageModal.tsx b/frontend/src/metabase/home/components/CustomHomePageModal/CustomHomePageModal.tsxindex 775080fd092..650b353c622 100644--- a/frontend/src/metabase/home/components/CustomHomePageModal/CustomHomePageModal.tsx+++ b/frontend/src/metabase/home/components/CustomHomePageModal/CustomHomePageModal.tsx@@ -44,12 +44,12 @@ export const CustomHomePageModal = ({<Box ml="0.5rem" mr="2.5rem"><Textspan- c="text-white"+ c="text-primary-inverse"fw={700}>{t`This dashboard has been set as your homepage.`}</Text><Textspan- c="text-white"+ c="text-primary-inverse">{t`You can change this in Admin > Settings > General.`}</Text></Box>),diff --git a/frontend/src/metabase/home/components/EmbedHomepage/EmbedJsContent.tsx b/frontend/src/metabase/home/components/EmbedHomepage/EmbedJsContent.tsxindex 3405ce5085f..215a12bdf95 100644--- a/frontend/src/metabase/home/components/EmbedHomepage/EmbedJsContent.tsx+++ b/frontend/src/metabase/home/components/EmbedHomepage/EmbedJsContent.tsx@@ -43,7 +43,7 @@ export const EmbedJsContent = ({fw="bold"mb="sm"size="lg"- color="text-medium"+ color="text-secondary"id="embed-js-title">{t`Modular embedding`}</Text><Text mb="md">diff --git a/frontend/src/metabase/home/components/EmbedHomepage/NeedMoreInfoCard.tsx b/frontend/src/metabase/home/components/EmbedHomepage/NeedMoreInfoCard.tsxindex f1687fcc62d..0287cc9f131 100644--- a/frontend/src/metabase/home/components/EmbedHomepage/NeedMoreInfoCard.tsx+++ b/frontend/src/metabase/home/components/EmbedHomepage/NeedMoreInfoCard.tsx@@ -13,8 +13,8 @@ export const NeedMoreInfoCard = ({analyticsDocsUrl,}: NeedMoreInfoCardProps) => (<Card px="xl">- <Text c="text-dark" fw="bold">{t`Need more information?`}</Text>- <Text c="text-light" size="sm">+ <Text c="text-primary" fw="bold">{t`Need more information?`}</Text>+ <Text c="text-tertiary" size="sm">{/* eslint-disable-next-line no-literal-metabase-strings -- only visible to admins */}{jt`Explore the ${(<ExternalLink key="embedding-docs" href={embeddingDocsUrl}>diff --git a/frontend/src/metabase/home/components/EmbedHomepage/SDKContent.tsx b/frontend/src/metabase/home/components/EmbedHomepage/SDKContent.tsxindex 167abd741df..002a5a104e3 100644--- a/frontend/src/metabase/home/components/EmbedHomepage/SDKContent.tsx+++ b/frontend/src/metabase/home/components/EmbedHomepage/SDKContent.tsx@@ -14,7 +14,7 @@ export const SDKContent = ({}: SDKContentProps) => (<Box component="section" aria-labelledby="sdk-title"><Group gap="sm" align="center" mb="sm">- <Text fw="bold" size="lg" color="text-medium" id="sdk-title">+ <Text fw="bold" size="lg" color="text-secondary" id="sdk-title">{t`Embedded analytics SDK for React`}</Text></Group>diff --git a/frontend/src/metabase/home/components/EmbedHomepage/StaticEmbedContent.tsx b/frontend/src/metabase/home/components/EmbedHomepage/StaticEmbedContent.tsxindex 20bb4473efe..7d75307e28b 100644--- a/frontend/src/metabase/home/components/EmbedHomepage/StaticEmbedContent.tsx+++ b/frontend/src/metabase/home/components/EmbedHomepage/StaticEmbedContent.tsx@@ -24,7 +24,7 @@ export const StaticEmbedContent = ({fw="bold"mb="sm"size="lg"- color="text-medium"+ color="text-secondary"id="static-embed-title">{t`Static embedding`}</Text><Text mb="md">diff --git a/frontend/src/metabase/home/components/HomeCaption/HomeCaption.styled.tsx b/frontend/src/metabase/home/components/HomeCaption/HomeCaption.styled.tsxindex 18f93f5a1cc..4ec9bd13658 100644--- a/frontend/src/metabase/home/components/HomeCaption/HomeCaption.styled.tsx+++ b/frontend/src/metabase/home/components/HomeCaption/HomeCaption.styled.tsx@@ -12,7 +12,7 @@ export const CaptionRoot = styled.div<CaptionProps>`display: flex;align-items: center;color: ${(props) =>- props.primary ? color("text-dark") : color("text-medium")};+ props.primary ? color("text-primary") : color("text-secondary")};font-weight: bold;margin-bottom: 1.5rem;diff --git a/frontend/src/metabase/home/components/HomeCard/HomeCard.styled.tsx b/frontend/src/metabase/home/components/HomeCard/HomeCard.styled.tsxindex d13a7abd8be..74772feb23a 100644--- a/frontend/src/metabase/home/components/HomeCard/HomeCard.styled.tsx+++ b/frontend/src/metabase/home/components/HomeCard/HomeCard.styled.tsx@@ -14,7 +14,7 @@ export const CardRoot = styled(Link)`padding: 1rem;border: 1px solid var(--mb-color-border);border-radius: 0.5rem;- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);box-shadow: 0 7px 20px var(--mb-color-shadow);max-width: 100%;diff --git a/frontend/src/metabase/home/components/HomeGreeting/HomeGreeting.module.css b/frontend/src/metabase/home/components/HomeGreeting/HomeGreeting.module.cssindex c9d9bb6040b..2541ab45b7c 100644--- a/frontend/src/metabase/home/components/HomeGreeting/HomeGreeting.module.css+++ b/frontend/src/metabase/home/components/HomeGreeting/HomeGreeting.module.css@@ -30,7 +30,7 @@}.greetingMessage {- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);font-weight: bold;line-height: 1.5rem;diff --git a/frontend/src/metabase/home/components/HomeLayout/HomeLayout.styled.tsx b/frontend/src/metabase/home/components/HomeLayout/HomeLayout.styled.tsxindex 20dedc38155..5c8abe658ee 100644--- a/frontend/src/metabase/home/components/HomeLayout/HomeLayout.styled.tsx+++ b/frontend/src/metabase/home/components/HomeLayout/HomeLayout.styled.tsx@@ -13,7 +13,7 @@ export const LayoutRoot = styled.div`position: relative;min-height: 100%;padding: 1rem;- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);${breakpointMinMedium} {padding: 3rem 4rem;diff --git a/frontend/src/metabase/home/components/HomeModelCard/HomeModelCard.styled.tsx b/frontend/src/metabase/home/components/HomeModelCard/HomeModelCard.styled.tsxindex 8d7c3507323..d5d13d90b76 100644--- a/frontend/src/metabase/home/components/HomeModelCard/HomeModelCard.styled.tsx+++ b/frontend/src/metabase/home/components/HomeModelCard/HomeModelCard.styled.tsx@@ -11,7 +11,7 @@ export const CardIcon = styled(Icon)``;export const CardTitle = styled(Ellipsified)`- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);font-size: 1rem;font-weight: bold;margin-left: 1rem;diff --git a/frontend/src/metabase/home/components/HomeXrayCard/HomeXrayCard.styled.tsx b/frontend/src/metabase/home/components/HomeXrayCard/HomeXrayCard.styled.tsxindex 57b7a9a63d1..49964ad509f 100644--- a/frontend/src/metabase/home/components/HomeXrayCard/HomeXrayCard.styled.tsx+++ b/frontend/src/metabase/home/components/HomeXrayCard/HomeXrayCard.styled.tsx@@ -21,9 +21,9 @@ export const CardTitle = styled(Ellipsified)``;export const CardTitlePrimary = styled.span`- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);`;export const CardTitleSecondary = styled.span`- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);`;diff --git a/frontend/src/metabase/home/components/Onboarding/Onboarding.module.css b/frontend/src/metabase/home/components/Onboarding/Onboarding.module.cssindex 8df2119cf64..9dc18aafcc5 100644--- a/frontend/src/metabase/home/components/Onboarding/Onboarding.module.css+++ b/frontend/src/metabase/home/components/Onboarding/Onboarding.module.css@@ -1,5 +1,5 @@.page {- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);position: relative;}@@ -17,7 +17,7 @@}.label:not([data-css-specificity-hack="🪗"]) {- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);font-weight: normal;}@@ -29,7 +29,7 @@);border: 1px solid var(--mb-color-border);border-radius: 0.5rem;- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);padding-left: 0;height: 3rem;@@ -70,7 +70,7 @@.content:not([data-css-specificity-hack="🪗"]) {border: 0;- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);padding-inline: 1rem;padding-top: 1.5rem;padding-bottom: 3rem;@@ -83,7 +83,7 @@width: 3rem;[data-active="true"] & {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);}}diff --git a/frontend/src/metabase/home/components/Onboarding/Onboarding.tsx b/frontend/src/metabase/home/components/Onboarding/Onboarding.tsxindex 31d1f7ac76e..ae0d9eb780b 100644--- a/frontend/src/metabase/home/components/Onboarding/Onboarding.tsx+++ b/frontend/src/metabase/home/components/Onboarding/Onboarding.tsx@@ -339,7 +339,7 @@ export const Onboarding = () => {<Text>{jt`Hover over a table and click the yellow lightning bolt ${(<Icon- c="var(--mb-color-warning)"+ c="warning"className={S.inlineIcon}key="bolt_icon"name="bolt_filled"diff --git a/frontend/src/metabase/lib/colors/colors.ts b/frontend/src/metabase/lib/colors/colors.tsindex 99537d6ef76..3842edc1085 100644--- a/frontend/src/metabase/lib/colors/colors.ts+++ b/frontend/src/metabase/lib/colors/colors.ts@@ -46,7 +46,7 @@ const baseColors = {// Deprecated Graygray: {- 100: "hsla(206, 16%, 8%, 1.00)", // bg-black+ 100: "hsla(206, 16%, 8%, 1.00)", // background-primary-inverse90: "hsla(202, 15%, 15%, 1.00)",80: "hsla(205, 15%, 23%, 1.00)",70: "hsla(206, 14%, 32%, 1.00)",@@ -258,8 +258,8 @@ const getColorConfig = (settings: ColorSettings = {}) => ({dark: baseColors.octopus[60],},"background-brand": {- light: baseColors.brand[20],- dark: baseColors.brand[70],+ light: baseColors.brand[10],+ dark: baseColors.brand[90],},"background-disabled": {light: baseColors.orionAlpha[10],@@ -281,22 +281,36 @@ const getColorConfig = (settings: ColorSettings = {}) => ({light: `color-mix(in srgb, var(--mb-color-brand) 7%, transparent)`, //baseColors.oceanAlpha[10],dark: `color-mix(in srgb, var(--mb-color-brand) 7%, transparent)`, //baseColors.oceanAlpha[10],},- "background-inverse": {- light: baseColors.orion[80],- dark: baseColors.orion[20],++ "background-selected": {+ light: baseColors.brand[50],+ dark: baseColors.brand[40],+ },+ "background-primary": {+ light: baseColors.white,+ dark: baseColors.orion[100],},- "background-light": {- //should be background-secondary+ "background-secondary": {light: baseColors.orion[5],dark: baseColors.orion[110],},- "background-selected": {- light: baseColors.brand[50],- dark: baseColors.brand[40],+ "background-tertiary": {+ light: baseColors.orion[10],+ dark: baseColors.orion[80],},- background: { light: baseColors.white, dark: baseColors.orion[100] }, //should be background-primary- "bg-black-alpha-60": {- //should be called overlay? this label is not semantic+ "background-primary-inverse": {+ light: baseColors.orion[80],+ dark: baseColors.orion[20],+ },+ "background-secondary-inverse": {+ light: baseColors.orion[70],+ dark: baseColors.orion[30],+ }, // Only used one place+ "background-tertiary-inverse": {+ light: baseColors.orion[40],+ dark: baseColors.orion[70],+ },+ overlay: {light: baseColors.orionAlpha[60],dark: baseColors.orionAlpha[70],},@@ -304,10 +318,6 @@ const getColorConfig = (settings: ColorSettings = {}) => ({light: baseColors.oceanAlpha[5],dark: baseColors.oceanAlpha[20],},- "bg-black": { light: baseColors.orion[80], dark: baseColors.orion[20] }, //should be background-primary-inverse- "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],@@ -316,36 +326,6 @@ const getColorConfig = (settings: ColorSettings = {}) => ({light: baseColors.palm[5],dark: baseColors.palm[90],},- "bg-light": { light: baseColors.orion[5], dark: baseColors.orion[110] }, //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?- "bg-white-alpha-15": {- light: baseColors.orionAlphaInverse[20],- dark: baseColors.orionAlphaInverse[20],- },- "bg-white": {- //should be background-primary- light: baseColors.white,- dark: baseColors.orion[100],- },- "bg-yellow": {- light: baseColors.dubloon[5],- dark: baseColors.dubloon[90],- },- "border-alpha-30": {- //should be border- light: baseColors.orionAlpha[20],- dark: baseColors.orionAlphaInverse[20],- },- "border-dark": {- //should be border-strong- light: baseColors.orionAlpha[50],- dark: baseColors.orionAlphaInverse[50],- },- border: {- light: baseColors.orion[20],- dark: baseColors.orionAlphaInverse[20],- },"brand-alpha-04": {//all of these colors derived from brand should be reworked to fit the values in the new color palette, and to have semantic nameslight: `color-mix(in srgb, var(--mb-color-brand) 4%, transparent)`,@@ -391,21 +371,17 @@ const getColorConfig = (settings: ColorSettings = {}) => ({light: baseColors.blue[20],dark: baseColors.blue[70],},- "icon-primary-disabled": {- light: baseColors.orion[30],- dark: baseColors.orion[30],- },"icon-primary": {light: baseColors.brand[40],dark: baseColors.brand[40],},- "icon-secondary-disabled": {- light: baseColors.orion[10],- dark: baseColors.orion[10],+ "icon-disabled": {+ light: baseColors.orionAlpha[30],+ dark: baseColors.orionAlphaInverse[30],},"icon-secondary": {- light: baseColors.orion[50],- dark: baseColors.orion[50],+ light: baseColors.orionAlpha[50],+ dark: baseColors.orionAlphaInverse[50],},"metabase-brand": {light: baseColors.blue[40], // not for whitelabeling@@ -431,22 +407,15 @@ const getColorConfig = (settings: ColorSettings = {}) => ({light: baseColors.dubloon[30],dark: baseColors.dubloon[30],},- "shadow-embedding-hub-card": {- //I think this can be removed?- light: "hsla(208, 55%, 77%, 0.70)",- dark: "hsla(208, 55%, 77%, 0.70)",- },shadow: {light: baseColors.orionAlpha[20],dark: `color-mix(in srgb, ${baseColors.orion[110]} 20%, transparent)`,},- "success-darker": {- //should be success-primary?+ "success-secondary": {light: baseColors.palm[60],dark: baseColors.palm[40],},success: {- //should be success-secondary?light: baseColors.palm[50],dark: baseColors.palm[50],},@@ -470,15 +439,11 @@ const getColorConfig = (settings: ColorSettings = {}) => ({light: baseColors.brand[50],dark: baseColors.brand[40],},- "text-dark": {- light: baseColors.orionAlpha[80] /* @deprecated, use text-primary */,- dark: baseColors.orionAlphaInverse[80],- },- "text-disabled": {+ "text-tertiary": {light: baseColors.orionAlpha[40],dark: baseColors.orionAlphaInverse[40],},- "text-disabled-inverse": {+ "text-tertiary-inverse": {light: baseColors.orionAlphaInverse[40],dark: baseColors.orionAlpha[40],},@@ -486,20 +451,9 @@ const getColorConfig = (settings: ColorSettings = {}) => ({light: baseColors.brand[60],dark: baseColors.brand[30], //CHANGED DOWN TO HERE},- "text-light": {- //should be text-disabled- light: baseColors.orionAlpha[40],- dark: baseColors.orionAlphaInverse[40],- },- "text-medium": {- //should be text-secondary- light: baseColors.orionAlpha[60],- dark: baseColors.orionAlphaInverse[60],- },//Used in gauge viz... there should be a better way to do this- "text-medium-opaque": {- //should be text-secondary+ "text-secondary-opaque": {light: baseColors.orion[60],dark: baseColors.orion[20],},@@ -523,21 +477,6 @@ const getColorConfig = (settings: ColorSettings = {}) => ({light: baseColors.white,dark: baseColors.white,},- "text-tertiary": {- //should be text-disabled- light: baseColors.orionAlpha[40],- dark: baseColors.orionAlphaInverse[40],- },- "text-white-alpha-85": {- //should be text-primary-inverse- light: baseColors.orionAlphaInverse[80],- dark: baseColors.orionAlpha[80],- },- "text-white": {- //should be text-primary-inverse- light: baseColors.orionAlphaInverse[80],- dark: baseColors.orionAlpha[80],- },"tooltip-background-focused": {light: `color-mix(in srgb, ${baseColors.orion[80]} 50%, #000)`,dark: `color-mix(in srgb, ${baseColors.orion[70]} 50%, #000)`,@@ -561,8 +500,8 @@ const getColorConfig = (settings: ColorSettings = {}) => ({},"background-warning": {- light: baseColors.dubloon[10],- dark: baseColors.dubloon[60],+ light: baseColors.dubloon[5],+ dark: baseColors.dubloon[90],},info: {@@ -572,7 +511,7 @@ const getColorConfig = (settings: ColorSettings = {}) => ({"background-info": {light: baseColors.orion[10],- dark: baseColors.orion[80],+ dark: baseColors.orion[90],},white: {@@ -613,48 +552,38 @@ const getColorConfig = (settings: ColorSettings = {}) => ({light: "#7172AD",dark: "#7172AD",},- "bg-primary": {- light: baseColors.white,- dark: baseColors.orion[110],- },- "bg-secondary": {- light: baseColors.orion[5],- dark: baseColors.orion[100],- },- "bg-tertiary": {- //I don't think this is used?- light: baseColors.orion[10],- dark: baseColors.orion[90],- },- "bg-hover": {- //I don't think this is used?- light: baseColors.orion[5],- dark: baseColors.orion[90],- },- overlay: {- //see the other color above where I mentioned it should be called overlay- light: baseColors.orionAlpha[60],- dark: "hsla(207, 100%, 4.3%, 0.8)", // FIXME: should be part of palette- },- "text-inverse": {- //should be text-primary-inverse- light: baseColors.orionAlphaInverse[80],- dark: baseColors.orionAlpha[80],++ border: {+ light: baseColors.orion[20],+ dark: baseColors.orionAlphaInverse[20],},- "border-primary": {- //should be border-strong+ "border-strong": {light: baseColors.orionAlpha[50],dark: baseColors.orionAlphaInverse[50],},- "border-secondary": {- //should be border- light: baseColors.orionAlpha[20],- dark: baseColors.orionAlphaInverse[20],- },"border-subtle": {light: baseColors.orionAlpha[10],dark: baseColors.orionAlphaInverse[10],},++ // one-off colors for data layers which are not part of Metabase color palette+ // we got a blessing from the design team to use these colors 😇+ copper: {+ light: "#B87333",+ dark: "#B87333",+ },+ bronze: {+ light: "#CD7F32",+ dark: "#CD7F32",+ },+ silver: {+ light: "#C0C0C0",+ dark: "#C0C0C0",+ },+ gold: {+ light: "#FFD700",+ dark: "#FFD700",+ },});export const colorConfig = getColorConfig(whitelabelColors);@@ -688,17 +617,7 @@ export const mutateColors = (settings: ColorSettings) => {};export const staticVizOverrides = {- "text-dark": baseColors.orion[80],- "text-medium": baseColors.orion[60],- "text-light": baseColors.orion[40],+ "text-primary": baseColors.orion[80],+ "text-secondary": baseColors.orion[60],+ "text-tertiary": baseColors.orion[40],};--// one-off colors for data layers which are not part of Metabase color palette-// we got a blessing from the design team to use these colors 😇-export const dataLayerColors = {- copper: "#B87333",- bronze: "#CD7F32",- silver: "#C0C0C0",- gold: "#FFD700",- default: "#B87333",-} as const;diff --git a/frontend/src/metabase/lib/colors/palette.ts b/frontend/src/metabase/lib/colors/palette.tsindex eb26b7804c0..483f53c0991 100644--- a/frontend/src/metabase/lib/colors/palette.ts+++ b/frontend/src/metabase/lib/colors/palette.ts@@ -12,13 +12,13 @@ export const originalColors = getColors();export const aliases: Record<string, (palette: ColorPalette) => string> = {dashboard: (palette) => color("brand", palette),document: (palette) => color("brand", palette),- nav: (palette) => color("bg-white", palette),- content: (palette) => color("bg-light", palette),+ nav: (palette) => color("background-primary", palette),+ content: (palette) => color("background-secondary", palette),database: (palette) => color("accent2", palette),pulse: (palette) => color("accent4", palette),- "text-primary": (palette) => color("text-dark", palette),- "text-secondary": (palette) => color("text-medium", palette),- "text-tertiary": (palette) => color("text-light", palette),+ "text-primary": (palette) => color("text-primary", palette),+ "text-secondary": (palette) => color("text-secondary", palette),+ "text-tertiary": (palette) => color("text-tertiary", palette),background: (palette) => color("white", palette),"background-disbaled": (palette) => color("accent-gray", palette),"brand-light": (palette) => lighten(color("brand", palette), 0.532), // #DDECFA@@ -46,10 +46,10 @@ export const aliases: Record<string, (palette: ColorPalette) => string> = {/*** @deprecated use CSS variables instead where possible,- * i.e. `var(--mb-color-text-light)`.+ * i.e. `var(--mb-color-text-tertiary)`.** When the hex values are needed, use the themeColor function- * from Mantine's theme, i.e. `theme.fn.themeColor("text-light")`+ * from Mantine's theme, i.e. `theme.fn.themeColor("text-tertiary")`*/export function color(colorName: ColorName, palette?: ColorPalette): ColorName;export function color(color: string, palette?: ColorPalette): string;@@ -72,10 +72,10 @@ export function color(color: any, palette: ColorPalette = colors) {/*** @deprecated use the color-mix method with CSS variables instead- * where possible, i.e. `color-mix(in srgb, var(--mb-color-bg-light), transparent 10%)`+ * where possible, i.e. `color-mix(in srgb, var(--mb-color-background-secondary), transparent 10%)`** When the hex values are needed, use the themeColor function- * from Mantine's theme, i.e. `alpha(theme.fn.themeColor("text-light"), 0.1)`+ * from Mantine's theme, i.e. `alpha(theme.fn.themeColor("text-tertiary"), 0.1)`*/export const alpha = (c: string, a: number) => {return Color(color(c)).alpha(a).string();@@ -83,10 +83,10 @@ export const alpha = (c: string, a: number) => {/*** @deprecated use the color-mix method with CSS variables instead- * where possible, i.e. `color-mix(in srgb, var(--mb-color-text-light), white 10%)`+ * where possible, i.e. `color-mix(in srgb, var(--mb-color-text-tertiary), white 10%)`** When the hex values are needed, use the themeColor function- * from Mantine's theme, i.e. `lighten(theme.fn.themeColor("text-light"), 0.1)`+ * from Mantine's theme, i.e. `lighten(theme.fn.themeColor("text-tertiary"), 0.1)`*/export const lighten = (c: string, f: number = 0.5) => {return Color(color(c)).lighten(f).string();@@ -94,10 +94,10 @@ export const lighten = (c: string, f: number = 0.5) => {/*** @deprecated use the color-mix method with CSS variables instead- * where possible, i.e. `color-mix(in srgb, var(--mb-color-text-light), black 10%)`+ * where possible, i.e. `color-mix(in srgb, var(--mb-color-text-tertiary), black 10%)`** When the hex values are needed, use the themeColor function- * from Mantine's theme, i.e. `darken(theme.fn.themeColor("text-light"), 0.1)`+ * from Mantine's theme, i.e. `darken(theme.fn.themeColor("text-tertiary"), 0.1)`*/export const darken = (c: string, f: number = 0.25) => {return Color(color(c)).darken(f).string();@@ -147,13 +147,14 @@ export const getTextColorForBackground = (getColor: ColorGetter = color,) => {const whiteTextContrast =- Color(getColor(backgroundColor)).contrast(Color(getColor("text-white"))) *- whiteTextColorPriorityFactor;+ Color(getColor(backgroundColor)).contrast(+ Color(getColor("text-primary-inverse")),+ ) * whiteTextColorPriorityFactor;const darkTextContrast = Color(getColor(backgroundColor)).contrast(- Color(getColor("text-dark")),+ Color(getColor("text-primary")),);return whiteTextContrast > darkTextContrast- ? getColor("text-white")- : getColor("text-dark");+ ? getColor("text-primary-inverse")+ : getColor("text-primary");};diff --git a/frontend/src/metabase/lib/colors/scales.unit.spec.ts b/frontend/src/metabase/lib/colors/scales.unit.spec.tsindex 862a6a2294e..5c87831daaa 100644--- a/frontend/src/metabase/lib/colors/scales.unit.spec.ts+++ b/frontend/src/metabase/lib/colors/scales.unit.spec.ts@@ -5,8 +5,8 @@ import { getColorScale } from "./scales";describe("scales", () => {const colors = [- Color(color("bg-white")).hex(),- Color(color("bg-black")).hex(),+ Color(color("background-primary")).hex(),+ Color(color("background-primary-inverse")).hex(),];it("should interpolate colors by default", () => {diff --git a/frontend/src/metabase/lib/formatting/colors.ts b/frontend/src/metabase/lib/formatting/colors.tsindex 8be0855c59a..7ea69d554cf 100644--- a/frontend/src/metabase/lib/formatting/colors.ts+++ b/frontend/src/metabase/lib/formatting/colors.ts@@ -9,7 +9,7 @@ export function assignUserColors(color("error"),color("accent1"),color("accent4"),- color("bg-medium"),+ color("background-tertiary"),],) {const assignments: { [index: string]: string } = {};diff --git a/frontend/src/metabase/lib/groups.ts b/frontend/src/metabase/lib/groups.tsindex 2beaf9afdf6..1e9432fc5f0 100644--- a/frontend/src/metabase/lib/groups.ts+++ b/frontend/src/metabase/lib/groups.ts@@ -33,7 +33,7 @@ export function getGroupColor(group: Pick<GroupInfo, "magic_group_type">) {if (isAdminGroup(group)) {return color("filter");} else if (isDefaultGroup(group)) {- return color("text-medium");+ return color("text-secondary");} else {return color("brand");}diff --git a/frontend/src/metabase/list-view/components/ListView/ColumnValue.tsx b/frontend/src/metabase/list-view/components/ListView/ColumnValue.tsxindex 245fca2dfc7..ddf5e21507c 100644--- a/frontend/src/metabase/list-view/components/ListView/ColumnValue.tsx+++ b/frontend/src/metabase/list-view/components/ListView/ColumnValue.tsx@@ -91,7 +91,7 @@ export function ColumnValue({c="text-primary"variant="outline"style={{- background: "var(--mb-color-bg-white)",+ background: "var(--mb-color-background-primary)",textTransform: "capitalize",}}leftSection={@@ -134,7 +134,7 @@ export function ColumnValue({size="lg"variant="outline"style={{- background: "var(--mb-color-bg-white)",+ background: "var(--mb-color-background-primary)",color: "var(--mb-color-text-primary)",}}leftSection={@@ -160,7 +160,7 @@ export function ColumnValue({size="lg"variant="outline"style={{- background: "var(--mb-color-bg-white)",+ background: "var(--mb-color-background-primary)",}}>{value}@@ -222,7 +222,7 @@ export function ColumnValue({className={styles.badge}variant="outline"style={{- background: "var(--mb-color-bg-white)",+ background: "var(--mb-color-background-primary)",}}><Text fw="bold">@@ -278,7 +278,7 @@ export function ColumnValue({style={{objectFit: "cover",borderRadius: "0.5rem",- border: "1px solid var(--mb-color-border-secondary)",+ border: "1px solid var(--mb-color-border)",}}/>);diff --git a/frontend/src/metabase/list-view/components/ListView/ListView.module.css b/frontend/src/metabase/list-view/components/ListView/ListView.module.cssindex ed32fd8d1ad..a617dcb2bb3 100644--- a/frontend/src/metabase/list-view/components/ListView/ListView.module.css+++ b/frontend/src/metabase/list-view/components/ListView/ListView.module.css@@ -13,7 +13,7 @@width: 100%;padding-block: 0.75rem;padding-inline: var(--item-padding);- border-bottom: 1px solid var(--mb-color-border-secondary);+ border-bottom: 1px solid var(--mb-color-border);}.listBody {@@ -29,7 +29,7 @@width: 100%;height: 4rem;border-bottom: 1px solid var(--mb-color-border-subtle);- background: var(--mb-color-bg-white);+ background: var(--mb-color-background-primary);padding-inline: var(--item-padding, var(--mantine-spacing-md));&:hover {@@ -41,7 +41,7 @@cursor: inherit;padding-inline: var(--mantine-spacing-sm);color: var(--mb-color-text-secondary);- border-color: var(--mb-color-border-secondary);+ border-color: var(--mb-color-border);}}@@ -83,12 +83,12 @@align-items: start;border: 1px solid var(--mb-color-border);border-radius: var(--mantine-radius-md);- background: var(--mb-color-bg-white);+ background: var(--mb-color-background-primary);padding: var(--mantine-spacing-md);}.listEntityIcon {- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);&:hover {color: var(--mb-color-brand);diff --git a/frontend/src/metabase/list-view/components/ListView/ListView.tsx b/frontend/src/metabase/list-view/components/ListView/ListView.tsxindex 1c3848aafa9..6821fe9ef73 100644--- a/frontend/src/metabase/list-view/components/ListView/ListView.tsx+++ b/frontend/src/metabase/list-view/components/ListView/ListView.tsx@@ -180,13 +180,13 @@ function ColumnHeader({alignItems: "center",}}>- <Text fz="0.875rem" c="text-medium" style={{ display: "inline" }}>+ <Text fz="0.875rem" c="text-secondary" style={{ display: "inline" }}>{column.display_name}</Text>{sortedColumnName === column.name && (<Iconname={sortingDirection === "asc" ? "arrow_up" : "arrow_down"}- c="text-medium"+ c="text-secondary"size={14}style={{ display: "inline", marginLeft: 4 }}/>diff --git a/frontend/src/metabase/list-view/components/ListView/ListViewConfiguration.tsx b/frontend/src/metabase/list-view/components/ListView/ListViewConfiguration.tsxindex 0ef7e80d147..849375e6b71 100644--- a/frontend/src/metabase/list-view/components/ListView/ListViewConfiguration.tsx+++ b/frontend/src/metabase/list-view/components/ListView/ListViewConfiguration.tsx@@ -16,6 +16,7 @@ import {ReorderableTagsInput,SortablePill,} from "metabase/common/components/ReorderableTagsInput/ReorderableTagsInput";+import type { ColorName } from "metabase/lib/colors/types";import { getColumnExample } from "metabase/query_builder/components/expressions/CombineColumns/util";import {ActionIcon,@@ -268,8 +269,8 @@ export const ListViewConfiguration = ({className={S.listEntityIcon}c={iconConfig.entityIconEnabled- ? iconConfig.selectedIconColor- : "text-light"+ ? (iconConfig.selectedIconColor as ColorName)+ : "text-tertiary"}/>)}@@ -371,7 +372,7 @@ export const ListViewConfiguration = ({</SimpleGrid><Menu.Divider m={0} /><SimpleGrid cols={6} p="md" data-testid="list-view-icon-colors">- {ENTITY_ICON_COLORS.map((color: string) => (+ {ENTITY_ICON_COLORS.map((color) => (<Flex justify="center" align="center" key={color}><ButtonclassName={cx(S.iconColorButton, {diff --git a/frontend/src/metabase/list-view/components/ListView/styling.ts b/frontend/src/metabase/list-view/components/ListView/styling.tsindex 2fba528155f..cd27a5a6c5a 100644--- a/frontend/src/metabase/list-view/components/ListView/styling.ts+++ b/frontend/src/metabase/list-view/components/ListView/styling.ts@@ -1,3 +1,4 @@+import type { ColorName } from "metabase/lib/colors/types";import type { IconName } from "metabase/ui";import { color, maybeColor } from "metabase/ui/utils/colors";@@ -27,13 +28,13 @@ export const getEntityIcon = (entityType?: string) => {) as IconName;};-export const ENTITY_ICON_COLORS = [- color("text-primary"),- color("brand"),- color("accent1"),- color("accent2"),- color("accent3"),- color("accent6"),+export const ENTITY_ICON_COLORS: ColorName[] = [+ "text-primary",+ "brand",+ "accent1",+ "accent2",+ "accent3",+ "accent6",];// For icons with default color, use white background,@@ -62,7 +63,7 @@ const CATEGORY_COLORS = [// Get a consistent color for a category value based on its hashexport const getCategoryColor = (categoryValue: any, columnName: string) => {if (categoryValue == null || categoryValue === "") {- return "var(--mb-color-background-light)";+ return "var(--mb-color-background-secondary)";}const stringValue = String(categoryValue);diff --git a/frontend/src/metabase/metadata/components/CurrencyPicker/CurrencyPicker.tsx b/frontend/src/metabase/metadata/components/CurrencyPicker/CurrencyPicker.tsxindex 62bc8956edd..3419d20396a 100644--- a/frontend/src/metabase/metadata/components/CurrencyPicker/CurrencyPicker.tsx+++ b/frontend/src/metabase/metadata/components/CurrencyPicker/CurrencyPicker.tsx@@ -60,7 +60,7 @@ export const CurrencyPicker = ({<span>{item.option.label}</span><Text- c="text-light"+ c="text-tertiary"className={S.symbol}flex="0 0 auto"lh="1rem"@@ -73,13 +73,7 @@ export const CurrencyPicker = ({}}rightSection={<Flex align="center" gap="xs" pos="relative">- <Text- bg="var(--input-bg)"- c="text-light"- pos="absolute"- px="sm"- right="100%"- >+ <Text c="text-tertiary" pos="absolute" px="sm" right="100%">{SYMBOLS[value]}</Text>diff --git a/frontend/src/metabase/metadata/components/FieldList/FieldItem/FieldItem.module.css b/frontend/src/metabase/metadata/components/FieldList/FieldItem/FieldItem.module.cssindex e9e36ead8cf..8384762a9bc 100644--- a/frontend/src/metabase/metadata/components/FieldList/FieldItem/FieldItem.module.css+++ b/frontend/src/metabase/metadata/components/FieldList/FieldItem/FieldItem.module.css@@ -42,7 +42,7 @@textarea {&:focus,&:hover {- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);}}}diff --git a/frontend/src/metabase/metadata/components/FieldList/FieldItem/FieldItem.tsx b/frontend/src/metabase/metadata/components/FieldList/FieldItem/FieldItem.tsxindex 719793c9338..0999f1d8a0b 100644--- a/frontend/src/metabase/metadata/components/FieldList/FieldItem/FieldItem.tsx+++ b/frontend/src/metabase/metadata/components/FieldList/FieldItem/FieldItem.tsx@@ -77,8 +77,8 @@ export function FieldItem({return (<Cardaria-label={field.display_name}- bg={active ? "brand-light" : "bg-white"}- c="text-medium"+ bg={active ? "brand-light" : "background-primary"}+ c="text-secondary"className={cx(S.card, {[S.active]: active,})}@@ -106,7 +106,7 @@ export function FieldItem({><Groupalign="center"- c="text-light"+ c="text-tertiary"flex="0 0 auto"gap={0}maw="100%"diff --git a/frontend/src/metabase/metadata/components/FieldSection/BehaviorSection/RemappingPicker/CustomMappingModal/CustomMappingModal.tsx b/frontend/src/metabase/metadata/components/FieldSection/BehaviorSection/RemappingPicker/CustomMappingModal/CustomMappingModal.tsxindex 2e5c5704217..c86acfad455 100644--- a/frontend/src/metabase/metadata/components/FieldSection/BehaviorSection/RemappingPicker/CustomMappingModal/CustomMappingModal.tsx+++ b/frontend/src/metabase/metadata/components/FieldSection/BehaviorSection/RemappingPicker/CustomMappingModal/CustomMappingModal.tsx@@ -131,7 +131,7 @@ export const CustomMappingModal = ({</Box><Group- bg="background"+ bg="background-primary"bottom={0}className={S.footer}gap="md"diff --git a/frontend/src/metabase/metadata/components/FieldSection/BehaviorSection/RemappingPicker/DisplayValuesPicker/DisplayValuesPicker.module.css b/frontend/src/metabase/metadata/components/FieldSection/BehaviorSection/RemappingPicker/DisplayValuesPicker/DisplayValuesPicker.module.cssindex f2386a21b84..a07ec785e02 100644--- a/frontend/src/metabase/metadata/components/FieldSection/BehaviorSection/RemappingPicker/DisplayValuesPicker/DisplayValuesPicker.module.css+++ b/frontend/src/metabase/metadata/components/FieldSection/BehaviorSection/RemappingPicker/DisplayValuesPicker/DisplayValuesPicker.module.css@@ -7,7 +7,7 @@* its parent (i.e. SelectItem) to apply the hover styles. We override this here.* This will effectively cover the element with a background*/- background-color: var(--mb-color-background) !important;+ background-color: var(--mb-color-background-primary) !important;color: var(--mb-color-text-primary) !important;/*** There's also margin-top: 1px involved, which causes 1px of the background color to be shown.diff --git a/frontend/src/metabase/metadata/components/LayerInput.tsx b/frontend/src/metabase/metadata/components/LayerInput.tsxindex f1d39191fe5..01807cac494 100644--- a/frontend/src/metabase/metadata/components/LayerInput.tsx+++ b/frontend/src/metabase/metadata/components/LayerInput.tsx@@ -1,7 +1,7 @@import type { FocusEvent } from "react";import { t } from "ttag";-import { dataLayerColors } from "metabase/lib/colors";+import type { ColorName } from "metabase/lib/colors/types";import { Group, Icon, Select, SelectItem, type SelectProps } from "metabase/ui";import type { TableDataLayer } from "metabase-types/api";@@ -71,9 +71,9 @@ function isDataLayer(value: string): value is TableDataLayer {return dataLayers.some((layer) => layer === value);}-function getColor(value: TableDataLayer | string): string {+function getColor(value: TableDataLayer | string): ColorName {if (isDataLayer(value)) {- return dataLayerColors[value];+ return value;}- return dataLayerColors.default;+ return "copper";}diff --git a/frontend/src/metabase/metadata/components/NameDescriptionInput/NameDescriptionInput.tsx b/frontend/src/metabase/metadata/components/NameDescriptionInput/NameDescriptionInput.tsxindex 7e5a3b2c4d0..2967098d2d4 100644--- a/frontend/src/metabase/metadata/components/NameDescriptionInput/NameDescriptionInput.tsx+++ b/frontend/src/metabase/metadata/components/NameDescriptionInput/NameDescriptionInput.tsx@@ -67,7 +67,7 @@ export const NameDescriptionInput = ({leftSection={<Groupalign="center"- c="text-light"+ c="text-tertiary"gap={10}flex="1"fs="lg"@@ -85,7 +85,7 @@ export const NameDescriptionInput = ({lines={1}tooltip={namePrefix}>- <Text c="text-light" component="span" size="lg">+ <Text c="text-tertiary" component="span" size="lg">{namePrefix}{":"}</Text>diff --git a/frontend/src/metabase/metadata/components/PreviewSection/Error/Error.tsx b/frontend/src/metabase/metadata/components/PreviewSection/Error/Error.tsxindex ed156a1c5ec..d5a593e1509 100644--- a/frontend/src/metabase/metadata/components/PreviewSection/Error/Error.tsx+++ b/frontend/src/metabase/metadata/components/PreviewSection/Error/Error.tsx@@ -8,8 +8,14 @@ interface Props {export function Error({ message }: Props) {return (- <Stack align="center" color="text-light" h="100%" justify="center" p="xl">- <Box bg="bg-medium" className={S.error} mt="lg" p="md">+ <Stack+ align="center"+ color="text-tertiary"+ h="100%"+ justify="center"+ p="xl"+ >+ <Box bg="background-tertiary" className={S.error} mt="lg" p="md"><Icon name="warning" size={16} /></Box>diff --git a/frontend/src/metabase/metadata/components/PreviewSection/PreviewSection.tsx b/frontend/src/metabase/metadata/components/PreviewSection/PreviewSection.tsxindex 413b686bd7d..36508dc99a1 100644--- a/frontend/src/metabase/metadata/components/PreviewSection/PreviewSection.tsx+++ b/frontend/src/metabase/metadata/components/PreviewSection/PreviewSection.tsx@@ -60,7 +60,11 @@ const PreviewSectionBase = ({<Group justify="space-between"><Text fw="bold">{t`Field preview`}</Text>- <ActionIcon color="text-dark" variant="transparent" onClick={onClose}>+ <ActionIcon+ color="text-primary"+ variant="transparent"+ onClick={onClose}+ ><Icon name="close" /></ActionIcon></Group>diff --git a/frontend/src/metabase/metadata/components/SortableFieldItem/SortableFieldItem.tsx b/frontend/src/metabase/metadata/components/SortableFieldItem/SortableFieldItem.tsxindex d368d771b36..536ba2a3a8e 100644--- a/frontend/src/metabase/metadata/components/SortableFieldItem/SortableFieldItem.tsx+++ b/frontend/src/metabase/metadata/components/SortableFieldItem/SortableFieldItem.tsx@@ -39,8 +39,8 @@ export function SortableFieldItem<T extends number | string>({><Cardaria-label={label}- bg={active ? "brand-light" : "bg-white"}- c="text-medium"+ bg={active ? "brand-light" : "background-primary"}+ c="text-secondary"className={cx(S.card, {[S.active]: active,[S.draggable]: draggable,diff --git a/frontend/src/metabase/metadata/components/TableSection/TableSection.tsx b/frontend/src/metabase/metadata/components/TableSection/TableSection.tsxindex 1daa4b584e6..a47c24fdee0 100644--- a/frontend/src/metabase/metadata/components/TableSection/TableSection.tsx+++ b/frontend/src/metabase/metadata/components/TableSection/TableSection.tsx@@ -158,7 +158,7 @@ const TableSectionBase = ({pos="sticky"pt="lg"top={0}- bg="bg-light"+ bg="background-secondary">{withName && (<NameDescriptionInput@@ -174,7 +174,7 @@ const TableSectionBase = ({component={Link}to={Urls.queryBuilderTable(table.id, table.db_id)}variant="subtle"- color="text-light"+ color="text-tertiary"size="sm"mr="sm"aria-label={t`Go to this table`}diff --git a/frontend/src/metabase/metadata/hooks/useMetadataToasts.ts b/frontend/src/metabase/metadata/hooks/useMetadataToasts.tsindex 92f75cd3a45..41f0015e097 100644--- a/frontend/src/metabase/metadata/hooks/useMetadataToasts.ts+++ b/frontend/src/metabase/metadata/hooks/useMetadataToasts.ts@@ -22,7 +22,7 @@ export const useMetadataToasts = () => {(message: string) => {sendToast({icon: "warning_triangle_filled",- iconColor: "var(--mb-color-warning)",+ iconColor: "warning",message,});},diff --git a/frontend/src/metabase/metadata/pages/DataModelV1/DataModelV1.tsx b/frontend/src/metabase/metadata/pages/DataModelV1/DataModelV1.tsxindex 3df637ee6de..fd29b49721e 100644--- a/frontend/src/metabase/metadata/pages/DataModelV1/DataModelV1.tsx+++ b/frontend/src/metabase/metadata/pages/DataModelV1/DataModelV1.tsx@@ -96,9 +96,9 @@ export const DataModelV1 = ({ children, location, params }: Props) => {}return (- <Flex bg="bg-light" data-testid="data-model" h="100%">+ <Flex bg="background-secondary" data-testid="data-model" h="100%"><Stack- bg="bg-white"+ bg="background-primary"className={S.column}flex={COLUMN_CONFIG.nav.flex}gap={0}diff --git a/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/EmptyState.module.css b/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/EmptyState.module.cssindex 44a13de2ba6..2bce44f21b6 100644--- a/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/EmptyState.module.css+++ b/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/EmptyState.module.css@@ -3,6 +3,6 @@}.empyIcon {- background-color: var(--mb-color-bg-medium);+ background-color: var(--mb-color-background-secondary-inverse);border-radius: 100%;}diff --git a/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/Results.tsx b/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/Results.tsxindex 51b2850bbae..f0ec5dfcd23 100644--- a/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/Results.tsx+++ b/frontend/src/metabase/metadata/pages/DataModelV1/components/TablePicker/components/Results.tsx@@ -237,7 +237,7 @@ export function Results({<Iconname="chevronright"size={10}- color="var(--mb-color-text-light)"+ c="text-tertiary"className={cx(S.chevron, {[S.expanded]: isExpanded,})}diff --git a/frontend/src/metabase/models/components/ModelActions/EmptyState.styled.tsx b/frontend/src/metabase/models/components/ModelActions/EmptyState.styled.tsxindex a5b6f68f27b..27380c203ae 100644--- a/frontend/src/metabase/models/components/ModelActions/EmptyState.styled.tsx+++ b/frontend/src/metabase/models/components/ModelActions/EmptyState.styled.tsx@@ -15,11 +15,11 @@ export const EmptyStateContainer = styled.div`export const EmptyStateTitle = styled.h4`font-size: 1rem;font-weight: 700;- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);`;export const EmptyStateMessage = styled.p`- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);font-size: 0.875rem;font-weight: 400;line-height: 1.18rem;diff --git a/frontend/src/metabase/models/components/ModelActions/ModelActionDetails/ModelActionListItem.styled.tsx b/frontend/src/metabase/models/components/ModelActions/ModelActionDetails/ModelActionListItem.styled.tsxindex 7e659aaf470..25b53961721 100644--- a/frontend/src/metabase/models/components/ModelActions/ModelActionDetails/ModelActionListItem.styled.tsx+++ b/frontend/src/metabase/models/components/ModelActions/ModelActionDetails/ModelActionListItem.styled.tsx@@ -17,7 +17,7 @@ export const ActionHeader = styled.div`export const ActionTitle = styled(Link)`font-size: 1rem;font-weight: 700;- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);cursor: ${(props) => (props.to ? "pointer" : "unset")};&:hover {@@ -30,7 +30,7 @@ export const ActionSubtitle = styled.span`font-size: 0.75rem;font-weight: 700;line-height: 0.875rem;- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);margin-top: 4px;`;@@ -43,7 +43,7 @@ export const ActionSubtitlePart = styled.span``;export const MenuIcon = styled(Icon)`- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);cursor: pointer;&:hover {@@ -68,8 +68,8 @@ export const CodeBlock = styled.pre`font-size: 0.7rem;white-space: pre-wrap;margin: 0;- color: var(--mb-color-text-white);- background-color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary-inverse);+ background-color: var(--mb-color-text-primary);`;export const ActionRunButtonContainer = styled.div`@@ -79,8 +79,8 @@ export const ActionRunButtonContainer = styled.div``;export const ActionRunButton = styled(Button)`- background-color: var(--mb-color-bg-white);- color: var(--mb-color-text-dark);+ background-color: var(--mb-color-background-primary);+ color: var(--mb-color-text-primary);`;export const ImplicitActionCardContentRoot = styled.div`@@ -88,7 +88,7 @@ export const ImplicitActionCardContentRoot = styled.div`display: flex;align-items: center;- color: var(--mb-color-text-medium);- background-color: var(--mb-color-bg-medium);+ color: var(--mb-color-text-secondary);+ background-color: var(--mb-color-background-tertiary);font-weight: 400;`;diff --git a/frontend/src/metabase/models/components/NewModelOption.jsx b/frontend/src/metabase/models/components/NewModelOption.jsxindex 30e73e7bc12..5c87a2f1f04 100644--- a/frontend/src/metabase/models/components/NewModelOption.jsx+++ b/frontend/src/metabase/models/components/NewModelOption.jsx@@ -23,8 +23,8 @@ export default class NewModelOption extends Component {style={{boxSizing: "border-box",boxShadow: hover- ? "0 3px 8px 0 var(--mb-color-text-light)"- : "0 1px 3px 0 var(--mb-color-text-light)",+ ? "0 3px 8px 0 var(--mb-color-text-tertiary)"+ : "0 1px 3px 0 var(--mb-color-text-tertiary)",minHeight: 340,}}onMouseOver={() => this.setState({ hover: true })}diff --git a/frontend/src/metabase/models/components/NewModelOption.module.css b/frontend/src/metabase/models/components/NewModelOption.module.cssindex 6ef5666ebf7..3cc11057dd9 100644--- a/frontend/src/metabase/models/components/NewModelOption.module.css+++ b/frontend/src/metabase/models/components/NewModelOption.module.css@@ -1,7 +1,7 @@.linkWrapper {text-decoration: none;display: block;- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);padding: var(--padding-4);align-items: center;border: var(--border-size) var(--border-style) var(--mb-color-border);diff --git a/frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.styled.tsx b/frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.styled.tsxindex e081ecf1d6f..e84496e112a 100644--- a/frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.styled.tsx+++ b/frontend/src/metabase/models/containers/NewModelOptions/NewModelOptions.styled.tsx@@ -27,7 +27,7 @@ export const OptionsRoot = styled.div``;export const EducationalButton = styled(ExternalLink)`- background-color: var(--mb-color-bg-medium);+ background-color: var(--mb-color-background-tertiary);border-radius: 0.5rem;color: var(--mb-color-brand);font-weight: bold;@@ -35,7 +35,7 @@ export const EducationalButton = styled(ExternalLink)`transition: all 0.3s;&:hover {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);background-color: var(--mb-color-brand);}`;diff --git a/frontend/src/metabase/nav/components/AdminNavbar/AdminNavItem.styled.tsx b/frontend/src/metabase/nav/components/AdminNavbar/AdminNavItem.styled.tsxindex bfa538ebaff..38939be9824 100644--- a/frontend/src/metabase/nav/components/AdminNavbar/AdminNavItem.styled.tsx+++ b/frontend/src/metabase/nav/components/AdminNavbar/AdminNavItem.styled.tsx@@ -28,13 +28,13 @@ export const AdminNavLink = styled(border-radius: 4px;color: ${(props) =>props.isSelected- ? "var(--mb-color-text-white)"- : "color-mix(in srgb, var(--mb-color-text-white), transparent 35%)"};+ ? "var(--mb-color-text-primary-inverse)"+ : "color-mix(in srgb, var(--mb-color-text-primary-inverse), transparent 35%)"};background-color: ${(props) =>props.isSelected ? darken("admin-navbar") : "transparent"};&:hover {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);background-color: ${() => darken("admin-navbar")};}`;diff --git a/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.module.css b/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.module.cssindex f37ffe1a90d..7af66880531 100644--- a/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.module.css+++ b/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.module.css@@ -1,3 +1,3 @@.MobileHamburgerIcon {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);}diff --git a/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.styled.tsx b/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.styled.tsxindex 48db97179a3..14c1332f509 100644--- a/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.styled.tsx+++ b/frontend/src/metabase/nav/components/AdminNavbar/AdminNavbar.styled.tsx@@ -12,11 +12,11 @@ import { color } from "metabase/ui/utils/colors";import { ADMIN_NAVBAR_HEIGHT } from "../../constants";export const AdminNavbarRoot = styled.nav`- --mb-color-text-white: var(--mantine-color-white);+ --mb-color-text-primary-inverse: var(--mantine-color-white);padding: 0.5rem 1rem;background: ${() => color("admin-navbar")};- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);font-size: 0.85rem;height: ${ADMIN_NAVBAR_HEIGHT};display: flex;@@ -74,7 +74,7 @@ export const AdminButtons = styled.div``;export const AdminActionButton = styled.button`- border: 1px solid ${() => alpha("bg-white", 0.2)};+ border: 1px solid ${() => alpha("background-primary", 0.2)};height: 2.625rem;width: 2.625rem;display: flex;@@ -84,38 +84,38 @@ export const AdminActionButton = styled.button`font-weight: 700;font-size: 13px;transition: all 200ms;- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);white-space: nowrap;text-align: center;&:disabled {- color: ${() => alpha("bg-white", 0.2)};+ color: ${() => alpha("background-primary", 0.2)};}&:hover {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);background-color: ${() => darken("admin-navbar")};border-color: ${() => darken("admin-navbar")};&:disabled {- color: ${() => alpha("bg-white", 0.2)};+ color: ${() => alpha("background-primary", 0.2)};}}`;export const AdminExitLink = styled(Link)`- border: 1px solid ${() => alpha("bg-white", 0.2)};+ border: 1px solid ${() => alpha("background-primary", 0.2)};padding: 12px 18px;border-radius: 5px;font-weight: 700;font-size: 13px;transition: all 200ms;- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);white-space: nowrap;text-align: center;&:hover {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);background-color: ${() => darken("admin-navbar")};border-color: ${() => darken("admin-navbar")};}diff --git a/frontend/src/metabase/nav/components/AppBar/AppBarLarge.styled.tsx b/frontend/src/metabase/nav/components/AppBar/AppBarLarge.styled.tsxindex 6a3c6d4f844..75a7b9adcb6 100644--- a/frontend/src/metabase/nav/components/AppBar/AppBarLarge.styled.tsx+++ b/frontend/src/metabase/nav/components/AppBar/AppBarLarge.styled.tsx@@ -17,7 +17,7 @@ export const AppBarRoot = styled.div<AppBarRootProps>`border-bottom: 1px solid${(props) =>props.hasSidebarOpen ? "var(--mb-color-border)" : "transparent"};- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);transition: border-bottom-color 200ms ease;`;diff --git a/frontend/src/metabase/nav/components/AppBar/AppBarLarge.tsx b/frontend/src/metabase/nav/components/AppBar/AppBarLarge.tsxindex a40fbd8646c..3a282d0a486 100644--- a/frontend/src/metabase/nav/components/AppBar/AppBarLarge.tsx+++ b/frontend/src/metabase/nav/components/AppBar/AppBarLarge.tsx@@ -107,7 +107,7 @@ const AppBarLarge = ({{isNewButtonVisible && <NewItemButton collectionId={collectionId} />}{!isEmbeddingIframe && <PLUGIN_METABOT.MetabotAppBarButton />}{isProfileLinkVisible && (- <Box c="var(--mb-color-text-primary)" aria-label={t`Settings menu`}>+ <Box c="text-primary" aria-label={t`Settings menu`}><ProfileLink /></Box>)}diff --git a/frontend/src/metabase/nav/components/AppBar/AppBarSmall.styled.tsx b/frontend/src/metabase/nav/components/AppBar/AppBarSmall.styled.tsxindex 418bf728a6a..e75c261882c 100644--- a/frontend/src/metabase/nav/components/AppBar/AppBarSmall.styled.tsx+++ b/frontend/src/metabase/nav/components/AppBar/AppBarSmall.styled.tsx@@ -53,5 +53,5 @@ export const AppBarLogoContainer = styled.div<AppBarLogoContainerProps>``;export const AppBarProfileLinkContainer = styled.div`- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);`;diff --git a/frontend/src/metabase/nav/components/AppBar/AppBarSmall.tsx b/frontend/src/metabase/nav/components/AppBar/AppBarSmall.tsxindex 2190da9932a..27d89ee6b8e 100644--- a/frontend/src/metabase/nav/components/AppBar/AppBarSmall.tsx+++ b/frontend/src/metabase/nav/components/AppBar/AppBarSmall.tsx@@ -67,7 +67,7 @@ const AppBarSmall = ({}, []);return (- <Box bg="var(--mb-color-bg-white)">+ <Box bg="background-primary">{isHeaderVisible && (<AppBarHeader isSubheaderVisible={isSubheaderVisible}><Flex justify="space-between" align="center" gap="sm" h="100%">diff --git a/frontend/src/metabase/nav/components/AppBar/AppBarToggle.styled.tsx b/frontend/src/metabase/nav/components/AppBar/AppBarToggle.styled.tsxindex 74c58a9ddab..9bbba80d605 100644--- a/frontend/src/metabase/nav/components/AppBar/AppBarToggle.styled.tsx+++ b/frontend/src/metabase/nav/components/AppBar/AppBarToggle.styled.tsx@@ -33,7 +33,7 @@ export const SidebarIcon = styled(Icon, {${(props) =>!props.isLogoVisible &&css`- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);&:hover {color: var(--mb-color-brand);diff --git a/frontend/src/metabase/nav/components/CollectionBreadcrumbs/CollectionBreadcrumbs.styled.tsx b/frontend/src/metabase/nav/components/CollectionBreadcrumbs/CollectionBreadcrumbs.styled.tsxindex 90fd53f56c9..e82a92989f4 100644--- a/frontend/src/metabase/nav/components/CollectionBreadcrumbs/CollectionBreadcrumbs.styled.tsx+++ b/frontend/src/metabase/nav/components/CollectionBreadcrumbs/CollectionBreadcrumbs.styled.tsx@@ -12,7 +12,7 @@ export const PathContainer = styled.div`export const BreadcrumbsPathSeparator = styled.div`display: flex;align-items: center;- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);font-size: 0.8em;font-weight: bold;margin-left: 0.5rem;diff --git a/frontend/src/metabase/nav/components/CollectionBreadcrumbs/CollectionBreadcrumbs.tsx b/frontend/src/metabase/nav/components/CollectionBreadcrumbs/CollectionBreadcrumbs.tsxindex fa6c88a4250..c72928241b0 100644--- a/frontend/src/metabase/nav/components/CollectionBreadcrumbs/CollectionBreadcrumbs.tsx+++ b/frontend/src/metabase/nav/components/CollectionBreadcrumbs/CollectionBreadcrumbs.tsx@@ -90,7 +90,7 @@ export const CollectionBreadcrumbs = ({{separator}<Badgeicon={{ name: "dashboard" }}- inactiveColor="text-light"+ inactiveColor="text-tertiary"isSingleLineto={Urls.dashboard(dashboard)}>diff --git a/frontend/src/metabase/nav/components/DevModeBanner/DevModeBanner.tsx b/frontend/src/metabase/nav/components/DevModeBanner/DevModeBanner.tsxindex 2c2474b5e9a..39350f8cddc 100644--- a/frontend/src/metabase/nav/components/DevModeBanner/DevModeBanner.tsx+++ b/frontend/src/metabase/nav/components/DevModeBanner/DevModeBanner.tsx@@ -8,7 +8,7 @@ export const DevModeBanner = () => {<Bannerbg="warning"body={- <Text fw="bold" c="text-dark">+ <Text fw="bold" c="text-primary">{t`This instance is in development mode. It is not allowed to be used for production purposes. All content is watermarked.`}</Text>}diff --git a/frontend/src/metabase/nav/components/LicenseTokenMissingBanner/LicenseTokenMissingBanner.tsx b/frontend/src/metabase/nav/components/LicenseTokenMissingBanner/LicenseTokenMissingBanner.tsxindex bdf0c219b6d..366d4848d2c 100644--- a/frontend/src/metabase/nav/components/LicenseTokenMissingBanner/LicenseTokenMissingBanner.tsx+++ b/frontend/src/metabase/nav/components/LicenseTokenMissingBanner/LicenseTokenMissingBanner.tsx@@ -14,9 +14,9 @@ export const LicenseTokenMissingBanner = ({}) => {return (<Banner- iconColor="var(--mb-color-tooltip-text)"+ iconColor="tooltip-text"className={styles.BannerContainer}- bg="var(--mb-color-tooltip-background)"+ bg="tooltip-background"aria-label={t`License activation notice`}aria-live="polite"role="status"diff --git a/frontend/src/metabase/nav/components/ProfileLink/ProfileLink.tsx b/frontend/src/metabase/nav/components/ProfileLink/ProfileLink.tsxindex 3e054ac9ac5..fea1b96425c 100644--- a/frontend/src/metabase/nav/components/ProfileLink/ProfileLink.tsx+++ b/frontend/src/metabase/nav/components/ProfileLink/ProfileLink.tsx@@ -175,7 +175,7 @@ function ProfileLinkInner({size="2.25rem"p="sm"variant="outline"- color="text-dark"+ color="text-primary"bd="1px solid var(--mb-color-border)"aria-label={t`Settings`}>diff --git a/frontend/src/metabase/nav/components/ReadOnlyBanner/ReadOnlyBanner.tsx b/frontend/src/metabase/nav/components/ReadOnlyBanner/ReadOnlyBanner.tsxindex c23fdf32510..f6024be2bae 100644--- a/frontend/src/metabase/nav/components/ReadOnlyBanner/ReadOnlyBanner.tsx+++ b/frontend/src/metabase/nav/components/ReadOnlyBanner/ReadOnlyBanner.tsx@@ -8,7 +8,7 @@ export const ReadOnlyBanner = () => {<Bannerbg="warning"body={- <Text fw="bold" c="text-dark">+ <Text fw="bold" c="text-primary">{/* eslint-disable-next-line no-literal-metabase-strings -- correct usage */}{t`Metabase is under maintenance and is operating in read-only mode. It should only take up to 30 minutes.`}</Text>diff --git a/frontend/src/metabase/nav/components/StoreLink/StoreLink.styled.tsx b/frontend/src/metabase/nav/components/StoreLink/StoreLink.styled.tsxindex 182dab08b76..89d6fedc58b 100644--- a/frontend/src/metabase/nav/components/StoreLink/StoreLink.styled.tsx+++ b/frontend/src/metabase/nav/components/StoreLink/StoreLink.styled.tsx@@ -17,11 +17,11 @@ export const StoreIconWrapper = styled.div`height: 40px;border-radius: 6px;cursor: pointer;- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);transition: all 300ms ease-in-out;&:hover {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);background-color: ${() => darken("filter")};}diff --git a/frontend/src/metabase/nav/components/WhatsNewNotification/WhatsNewNotification.styled.tsx b/frontend/src/metabase/nav/components/WhatsNewNotification/WhatsNewNotification.styled.tsxindex b6a8a9d1c07..c10ae4a254d 100644--- a/frontend/src/metabase/nav/components/WhatsNewNotification/WhatsNewNotification.styled.tsx+++ b/frontend/src/metabase/nav/components/WhatsNewNotification/WhatsNewNotification.styled.tsx@@ -4,9 +4,9 @@ import styled from "@emotion/styled";import IconButtonWrapper from "metabase/common/components/IconButtonWrapper";export const DismissIconButtonWrapper = styled(IconButtonWrapper)`- color: var(--mb-color-bg-dark);+ color: var(--mb-color-background-tertiary-inverse);&:hover {- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);}`;diff --git a/frontend/src/metabase/nav/components/search/SearchBar/CommandPaletteTrigger.tsx b/frontend/src/metabase/nav/components/search/SearchBar/CommandPaletteTrigger.tsxindex 7be9bebbec8..7acc42a291c 100644--- a/frontend/src/metabase/nav/components/search/SearchBar/CommandPaletteTrigger.tsx+++ b/frontend/src/metabase/nav/components/search/SearchBar/CommandPaletteTrigger.tsx@@ -16,7 +16,7 @@ export const CommandPaletteTrigger = ({tabIndex={-1}onClick={onClick}p="0.25rem"- bg="bg-light"+ bg="background-secondary"fw={700}fz="8pt"lh="8pt"@@ -29,7 +29,7 @@ export const CommandPaletteTrigger = ({root: {"&:active": { transform: "none" },"&:hover": {- color: color("text-dark"),+ color: color("text-primary"),},},}}diff --git a/frontend/src/metabase/nav/components/search/SearchBar/SearchBar.styled.tsx b/frontend/src/metabase/nav/components/search/SearchBar/SearchBar.styled.tsxindex dc22eb5c1e3..e3072ac4db4 100644--- a/frontend/src/metabase/nav/components/search/SearchBar/SearchBar.styled.tsx+++ b/frontend/src/metabase/nav/components/search/SearchBar/SearchBar.styled.tsx@@ -35,14 +35,13 @@ export const SearchInputContainer = styled.div<{${({ isActive }) => {if (isActive) {return css`- background-color: var(--mb-color-bg-medium);+ background-color: var(--mb-color-background-tertiary);`;}return css`- background-color: var(--mb-color-bg-white);-+ background-color: var(--mb-color-background-primary);&:hover {- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);}`;}}@@ -83,7 +82,7 @@ export const SearchInput = styled.input<{}>`background-color: transparent;border: none;- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);font-weight: 700;font-size: 0.875rem;flex-basis: 0;@@ -94,7 +93,7 @@ export const SearchInput = styled.input<{}&::placeholder {- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);}${breakpointMinSmall} {@@ -144,11 +143,11 @@ export const CloseSearchButton = styled.button`justify-content: center;width: 3rem;height: 100%;- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);cursor: pointer;&:hover {- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);}`;@@ -156,7 +155,7 @@ export const SearchResultsFloatingContainer = styled.div`position: absolute;left: 0;right: 0;- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);${breakpointMaxSmall} {top: ${APP_BAR_HEIGHT};diff --git a/frontend/src/metabase/nav/components/search/SearchButton/SearchButton.tsx b/frontend/src/metabase/nav/components/search/SearchButton/SearchButton.tsxindex 8fca7dd5f64..f4d51b58f35 100644--- a/frontend/src/metabase/nav/components/search/SearchButton/SearchButton.tsx+++ b/frontend/src/metabase/nav/components/search/SearchButton/SearchButton.tsx@@ -24,7 +24,7 @@ export const SearchButton = (props: ButtonProps) => {leftSection={<Icon name="search" />}variant="subtle"onClick={handleClick}- color="text-medium"+ color="text-secondary"aria-label="Search"/>);@@ -34,8 +34,8 @@ export const SearchButton = (props: ButtonProps) => {<Buttonh="36px"w="240px"- c="var(--mb-color-text-light)"- leftSection={<Icon name="search" c="var(--mb-color-text-primary)" />}+ c="text-tertiary"+ leftSection={<Icon name="search" c="text-primary" />}onClick={handleClick}styles={{inner: {diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbar.styled.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbar.styled.tsxindex fd1cc878642..105f64f4e0a 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbar.styled.tsx+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbar.styled.tsx@@ -22,7 +22,7 @@ export const Sidebar = styled.aside<{position: relative;flex-shrink: 0;align-items: center;- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);z-index: 4;width: ${(props) => props.width ?? NAV_SIDEBAR_WIDTH};${(props) =>@@ -79,7 +79,7 @@ export const TrashSidebarSection = styled(SidebarSection)`` as unknown as typeof Box;export const SidebarHeading = styled.h4`- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);font-weight: 700;font-size: 11px;text-transform: uppercase;diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/AddDataModal.module.css b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/AddDataModal.module.cssindex 1507e2c4e0f..ec6a6e2b0e8 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/AddDataModal.module.css+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/AddDataModal.module.css@@ -37,7 +37,7 @@}.dropZone {- background-color: var(--mb-color-background-light);+ background-color: var(--mb-color-background-secondary);border: 1px dashed var(--mb-color-border);border-radius: var(--default-border-radius);flex: 1;diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/AddDataModalEmptyStates.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/AddDataModalEmptyStates.tsxindex 4fc2dfcbfcc..54cffe749da 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/AddDataModalEmptyStates.tsx+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/AddDataModalEmptyStates.tsx@@ -127,7 +127,7 @@ const AddDataEmptyState = ({<Title order={2} size="h4" mb="xs">{title}</Title>- <Text c="text-medium">{subtitle}</Text>+ <Text c="text-secondary">{subtitle}</Text></Box>{ctaLink && (<Buttondiff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/CSVUpload.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/CSVUpload.tsxindex 2b75b41906c..3cd40680ac8 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/CSVUpload.tsx+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/CSVUpload.tsx@@ -227,7 +227,7 @@ export const CSVUpload = ({<div><Text fw="bold">{primaryText}</Text>{!uploadState.file && (- <Text c="text-light">+ <Text c="text-tertiary">{c("{0} is the allowed size of a file in MB").t`.csv or .tsv files, ${MAX_UPLOAD_STRING} MB max`}</Text>diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BookmarkList/BookmarkList.styled.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BookmarkList/BookmarkList.styled.tsxindex 2824e8a01bf..d9cfa095d5e 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BookmarkList/BookmarkList.styled.tsx+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BookmarkList/BookmarkList.styled.tsx@@ -25,7 +25,7 @@ export const SidebarBookmarkItem = styled(DraggableSidebarLink)`button {opacity: 0;color: ${(props) =>- props.isSelected ? color("text-white") : color("brand")};+ props.isSelected ? color("text-primary-inverse") : color("brand")};cursor: pointer;margin-top: 3px;diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BrowseNavSection.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BrowseNavSection.tsxindex 90b08070883..07262651939 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BrowseNavSection.tsx+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BrowseNavSection.tsx@@ -54,7 +54,7 @@ export const BrowseNavSection = ({<Tooltip label={t`Add data`}><ActionIconaria-label={t`Add data`}- color="var(--mb-color-text-medium)"+ color="text-secondary"onClick={() => {trackAddDataModalOpened("left-nav");onAddDataModalOpen();diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/GettingStartedSection.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/GettingStartedSection.tsxindex 9535f017849..2eeba7def60 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/GettingStartedSection.tsx+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/GettingStartedSection.tsx@@ -32,7 +32,7 @@ export const GettingStartedSection = ({gap="sm"onClick={toggle}component={UnstyledButton}- c="text-medium"+ c="text-secondary"mb="sm"className={CS.cursorPointer}>diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarView.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarView.tsxindex e94c13a2cf1..7be4a7f19c7 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarView.tsx+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarView.tsx@@ -262,7 +262,7 @@ export function MainNavbarView({<Tooltip label={t`Create a new collection`}><ActionIconaria-label={t`Create a new collection`}- color="var(--mb-color-text-medium)"+ color="text-secondary"onClick={() => {trackNewCollectionFromNavInitiated();handleCreateNewCollection();diff --git a/frontend/src/metabase/nav/containers/MainNavbar/NavbarErrorView.tsx b/frontend/src/metabase/nav/containers/MainNavbar/NavbarErrorView.tsxindex eb4b3621e09..b266bf39191 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/NavbarErrorView.tsx+++ b/frontend/src/metabase/nav/containers/MainNavbar/NavbarErrorView.tsx@@ -15,7 +15,7 @@ export function NavbarErrorView() {<Textfw={400}mt="0.5rem"- color="text-light"+ color="text-tertiary"size="lg">{t`An error occurred`}</Text></LoadingAndErrorContent>diff --git a/frontend/src/metabase/nav/containers/MainNavbar/SidebarItems/DraggableSidebarLink.styled.tsx b/frontend/src/metabase/nav/containers/MainNavbar/SidebarItems/DraggableSidebarLink.styled.tsxindex 78f00b1a573..93ceabea023 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/SidebarItems/DraggableSidebarLink.styled.tsx+++ b/frontend/src/metabase/nav/containers/MainNavbar/SidebarItems/DraggableSidebarLink.styled.tsx@@ -31,7 +31,7 @@ export const StyledSidebarLink = styled(SidebarLink)<{ isDragging: boolean }>`pointer-events: none;&:hover {- background: var(--mb-color-bg-white);+ background: var(--mb-color-background-primary);${SidebarLink.Icon}, ${DragIcon} {color: var(--mb-color-brand-light) !important;diff --git a/frontend/src/metabase/nav/containers/MainNavbar/SidebarItems/SidebarItems.styled.tsx b/frontend/src/metabase/nav/containers/MainNavbar/SidebarItems/SidebarItems.styled.tsxindex ed8683eb101..38dec0b8e25 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/SidebarItems/SidebarItems.styled.tsx+++ b/frontend/src/metabase/nav/containers/MainNavbar/SidebarItems/SidebarItems.styled.tsx@@ -8,6 +8,7 @@ import { forwardRef } from "react";import Link from "metabase/common/components/Link";import { TreeNode } from "metabase/common/components/tree/TreeNode";import { alpha } from "metabase/lib/colors";+import type { ColorName } from "metabase/lib/colors/types";import { NAV_SIDEBAR_WIDTH } from "metabase/nav/constants";import type { IconProps } from "metabase/ui";import { Icon, Tooltip } from "metabase/ui";@@ -20,7 +21,7 @@ export const SidebarIcon = styled(},),)<{- color?: string | null;+ color?: ColorName | string;isSelected: boolean;}>`${(props) =>@@ -83,7 +84,7 @@ export const NodeRoot = styled(TreeNode.Root)<NodeRootProps>``;const collectionDragAndDropHoverStyle = css`- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);background-color: var(--mb-color-brand);`;diff --git a/frontend/src/metabase/notifications/AddEditSidebar/CaveatMessage/CaveatMessage.styled.tsx b/frontend/src/metabase/notifications/AddEditSidebar/CaveatMessage/CaveatMessage.styled.tsxindex dabc1f7f674..7bacd4a845f 100644--- a/frontend/src/metabase/notifications/AddEditSidebar/CaveatMessage/CaveatMessage.styled.tsx+++ b/frontend/src/metabase/notifications/AddEditSidebar/CaveatMessage/CaveatMessage.styled.tsx@@ -10,7 +10,7 @@ export const CaveatText = styled(Text)`margin-right: 2rem;margin-top: 1rem;padding: 0.8rem;- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);line-height: 1.25rem;border-radius: 8px;background-color: ${() => alpha("accent4", 0.05)};diff --git a/frontend/src/metabase/notifications/AddEditSidebar/DefaultParametersSection.jsx b/frontend/src/metabase/notifications/AddEditSidebar/DefaultParametersSection.jsxindex fdafe6c5af9..129810a5110 100644--- a/frontend/src/metabase/notifications/AddEditSidebar/DefaultParametersSection.jsx+++ b/frontend/src/metabase/notifications/AddEditSidebar/DefaultParametersSection.jsx@@ -65,7 +65,7 @@ function DefaultParametersSection({ className, parameters }) {className={cx(CS.pt1, CS.flex, CS.alignCenter, CS.flexWrap)}key={index}>- <Badge inactiveColor="text-dark" isSingleLine={true}>+ <Badge inactiveColor="text-primary" isSingleLine={true}>{param.name}: {param.value}</Badge></div>diff --git a/frontend/src/metabase/notifications/AddEditSidebar/DeleteSubscriptionAction.tsx b/frontend/src/metabase/notifications/AddEditSidebar/DeleteSubscriptionAction.tsxindex f7e9d66add4..894305ad1fd 100644--- a/frontend/src/metabase/notifications/AddEditSidebar/DeleteSubscriptionAction.tsx+++ b/frontend/src/metabase/notifications/AddEditSidebar/DeleteSubscriptionAction.tsx@@ -80,7 +80,7 @@ export function DeleteSubscriptionAction({return (<><Flex className={cx(CS.borderTop, CS.pt1, CS.pb3)} justify="flex-end">- <Button variant="subtle" c="text-light" onClick={openModal}>+ <Button variant="subtle" c="text-tertiary" onClick={openModal}>{t`Delete this subscription`}</Button></Flex>diff --git a/frontend/src/metabase/notifications/PulsesListSidebar.jsx b/frontend/src/metabase/notifications/PulsesListSidebar.jsxindex da38046da4d..ec6a3d58f08 100644--- a/frontend/src/metabase/notifications/PulsesListSidebar.jsx+++ b/frontend/src/metabase/notifications/PulsesListSidebar.jsx@@ -70,7 +70,7 @@ function _PulsesListSidebar({aria-label={closeSidebarLabel}leftSection={<Icon name="close" size={16} />}variant="subtle"- color="text-medium"+ color="text-secondary"mr="-1rem"onClick={onCancel}/>diff --git a/frontend/src/metabase/notifications/channels/ChannelSettingsBlock.tsx b/frontend/src/metabase/notifications/channels/ChannelSettingsBlock.tsxindex 58034556ef4..369867852b8 100644--- a/frontend/src/metabase/notifications/channels/ChannelSettingsBlock.tsx+++ b/frontend/src/metabase/notifications/channels/ChannelSettingsBlock.tsx@@ -27,7 +27,7 @@ export const ChannelSettingsBlock = ({<Buttondata-testid="remove-channel-button"leftSection={<Icon name="close" />}- color="text-dark"+ color="text-primary"variant="subtle"size="compact-md"onClick={onRemoveChannel}diff --git a/frontend/src/metabase/notifications/channels/RecipientPicker.module.css b/frontend/src/metabase/notifications/channels/RecipientPicker.module.cssindex b74118f31d4..e86aa29adef 100644--- a/frontend/src/metabase/notifications/channels/RecipientPicker.module.css+++ b/frontend/src/metabase/notifications/channels/RecipientPicker.module.css@@ -1,3 +1,3 @@.tokenField {- background: var(--mb-color-background);+ background: var(--mb-color-background-primary);}diff --git a/frontend/src/metabase/notifications/channels/RecipientPicker.tsx b/frontend/src/metabase/notifications/channels/RecipientPicker.tsxindex 8184df9aa91..9733a02f783 100644--- a/frontend/src/metabase/notifications/channels/RecipientPicker.tsx+++ b/frontend/src/metabase/notifications/channels/RecipientPicker.tsx@@ -59,7 +59,7 @@ export const RecipientPicker = ({valueRenderer={(value) => value.common_name ?? value.email}optionRenderer={(option) => (<div className={cx(CS.flex, CS.alignCenter)}>- <Text color="text-white">+ <Text color="text-primary-inverse"><UserAvatar user={option.value} /></Text><span className={CS.ml1}>{option.value.common_name}</span>diff --git a/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/AlertTriggerIcon.tsx b/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/AlertTriggerIcon.tsxindex de53fb52bc9..0e4ef74e248 100644--- a/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/AlertTriggerIcon.tsx+++ b/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/AlertTriggerIcon.tsx@@ -4,7 +4,7 @@ export const AlertTriggerIcon = () => {return (<Centerp="0.625rem"- bg="var(--mb-color-brand)"+ bg="brand"w="2.5rem"h="2.5rem"style={{diff --git a/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/components/AlertModalSettingsBlock/AlertModalSettingsBlock.module.css b/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/components/AlertModalSettingsBlock/AlertModalSettingsBlock.module.cssindex dd154cfe906..3f0ef1e9a7b 100644--- a/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/components/AlertModalSettingsBlock/AlertModalSettingsBlock.module.css+++ b/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/components/AlertModalSettingsBlock/AlertModalSettingsBlock.module.css@@ -3,7 +3,7 @@--alert-modal-content-padding,var(--mantine-spacing-lg) var(--mantine-spacing-xl));- background-color: var(--mb-color-background-light);+ background-color: var(--mb-color-background-secondary);overflow: hidden;border-radius: var(--mantine-radius-md);}diff --git a/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/components/NotificationSchedule/NotificationSchedule.module.css b/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/components/NotificationSchedule/NotificationSchedule.module.cssindex 9def2bba72b..07496b9c906 100644--- a/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/components/NotificationSchedule/NotificationSchedule.module.css+++ b/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/components/NotificationSchedule/NotificationSchedule.module.css@@ -1,5 +1,5 @@.scheduleContainer {- background-color: var(--mb-color-background-light);+ background-color: var(--mb-color-background-secondary);padding: var(--notification-schedule-padding,var(--mantine-spacing-lg) var(--mantine-spacing-xl)diff --git a/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/components/NotificationSchedule/NotificationSchedule.tsx b/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/components/NotificationSchedule/NotificationSchedule.tsxindex 1674650ece0..d2c4599ee12 100644--- a/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/components/NotificationSchedule/NotificationSchedule.tsx+++ b/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/components/NotificationSchedule/NotificationSchedule.tsx@@ -85,7 +85,7 @@ export const NotificationSchedule = ({).t`${timezone}, your ${applicationName} timezone.`;return (- <Text c="var(--mb-color-text-secondary)">+ <Text c="text-secondary">{`${actionText} ${scheduleDescription} ${timezoneLabel}`}</Text>);diff --git a/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/components/NotificationSchedule/NotificationScheduleWarning.module.css b/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/components/NotificationSchedule/NotificationScheduleWarning.module.cssindex 88fe71cea25..1135a0c8039 100644--- a/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/components/NotificationSchedule/NotificationScheduleWarning.module.css+++ b/frontend/src/metabase/notifications/modals/CreateOrEditQuestionAlertModal/components/NotificationSchedule/NotificationScheduleWarning.module.css@@ -1,6 +1,9 @@.warningContainer {width: 100%;- background-color: var(--notification-warning-bg, var(--mb-color-bg-light));+ background-color: var(+ --notification-warning-bg,+ var(--mb-color-background-secondary)+ );padding: var(--notification-warning-padding,var(--mantine-spacing-md) var(--mantine-spacing-xl)diff --git a/frontend/src/metabase/notifications/modals/QuestionAlertListModal/AlertListItem.tsx b/frontend/src/metabase/notifications/modals/QuestionAlertListModal/AlertListItem.tsxindex 5624cb8ba00..85725c100ed 100644--- a/frontend/src/metabase/notifications/modals/QuestionAlertListModal/AlertListItem.tsx+++ b/frontend/src/metabase/notifications/modals/QuestionAlertListModal/AlertListItem.tsx@@ -100,7 +100,7 @@ export const AlertListItem = ({)}{user && (<>- <Text size="sm" c="text-light">+ <Text size="sm" c="text-tertiary">•</Text><Text size="sm" c="inherit">diff --git a/frontend/src/metabase/notifications/modals/components/NotificationChannelsAddMenu.tsx b/frontend/src/metabase/notifications/modals/components/NotificationChannelsAddMenu.tsxindex feb451fe1d6..98c7599f180 100644--- a/frontend/src/metabase/notifications/modals/components/NotificationChannelsAddMenu.tsx+++ b/frontend/src/metabase/notifications/modals/components/NotificationChannelsAddMenu.tsx@@ -102,7 +102,7 @@ export const NotificationChannelsAddMenu = ({<><Menu.Labelmt={!hasAddedEmail || !hasAddedSlack ? "1rem" : undefined}- c="text-medium"+ c="text-secondary">{t`Webhooks`}</Menu.Label>{notAddedHookChannels.map((channel) => (<Menu.Itemdiff --git a/frontend/src/metabase/palette/components/Palette.module.css b/frontend/src/metabase/palette/components/Palette.module.cssindex 13dd63bf55b..f27c307c8c5 100644--- a/frontend/src/metabase/palette/components/Palette.module.css+++ b/frontend/src/metabase/palette/components/Palette.module.css@@ -7,7 +7,7 @@border-bottom: 1px solid var(--border-color);border-top-left-radius: 0.5rem;border-top-right-radius: 0.5rem;- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);line-height: 1rem;outline: none;background-color: transparent;diff --git a/frontend/src/metabase/palette/components/Palette.tsx b/frontend/src/metabase/palette/components/Palette.tsxindex 0a52ca25403..6bde71a8a45 100644--- a/frontend/src/metabase/palette/components/Palette.tsx+++ b/frontend/src/metabase/palette/components/Palette.tsx@@ -90,7 +90,7 @@ export const PaletteContainer = withRouter(pos="absolute"top={26}>- <Icon c="text-dark" name="search" />+ <Icon c="text-primary" name="search" /></Stack></Box>diff --git a/frontend/src/metabase/palette/components/PaletteResultItem.tsx b/frontend/src/metabase/palette/components/PaletteResultItem.tsxindex 63af29cc084..171ace5ef8c 100644--- a/frontend/src/metabase/palette/components/PaletteResultItem.tsx+++ b/frontend/src/metabase/palette/components/PaletteResultItem.tsx@@ -32,8 +32,8 @@ export const PaletteResultItem = ({ item, active }: PaletteResultItemProps) => {flexGrow: 1,flexBasis: 0,}}- bg={active ? "var(--mb-color-background-hover)" : undefined}- c="var(--mb-color-text-dark)"+ bg={active ? "background-hover" : undefined}+ c="text-primary"aria-label={item.name}aria-disabled={item.disabled ? true : false}wrap="nowrap"@@ -59,7 +59,7 @@ export const PaletteResultItem = ({ item, active }: PaletteResultItemProps) => {status={item.extra.moderatedStatus}filledsize={14}- color="var(--mb-color-brand)"+ color="brand"style={{verticalAlign: "text-bottom",}}@@ -70,11 +70,7 @@ export const PaletteResultItem = ({ item, active }: PaletteResultItemProps) => {{subtext && (<Flexflex="0 0 auto"- c={- active- ? "var(--mb-color-text-medium)"- : "var(--mb-color-text-light)"- }+ c={active ? "text-secondary" : "text-tertiary"}fz="0.75rem"lh="1rem"maw="40%"@@ -89,11 +85,7 @@ export const PaletteResultItem = ({ item, active }: PaletteResultItemProps) => {{item.subtitle && (<Text- c={- active- ? "var(--mb-color-text-medium)"- : "var(--mb-color-text-light)"- }+ c={active ? "text-secondary" : "text-tertiary"}component="span"lh="1rem"style={{diff --git a/frontend/src/metabase/palette/components/PaletteResultItem.unit.spec.tsx b/frontend/src/metabase/palette/components/PaletteResultItem.unit.spec.tsxindex de31a9f4f60..5b7b21fe577 100644--- a/frontend/src/metabase/palette/components/PaletteResultItem.unit.spec.tsx+++ b/frontend/src/metabase/palette/components/PaletteResultItem.unit.spec.tsx@@ -38,19 +38,17 @@ describe("PaletteResultItem", () => {it("icons should default to brand color", async () => {setup({ item: { icon: "model" } });- expect(await screen.findByRole("img", { name: /model/ })).toHaveAttribute(- "color",- "var(--mb-color-brand)",- );+ expect(await screen.findByRole("img", { name: /model/ })).toHaveStyle({+ color: "var(--mb-color-brand)",+ });});it("icons should use provided colors when available", async () => {setup({ item: { icon: "model", extra: { iconColor: "accent1" } } });- expect(await screen.findByRole("img", { name: /model/ })).toHaveAttribute(- "color",- "var(--mb-color-accent1)",- );+ expect(await screen.findByRole("img", { name: /model/ })).toHaveStyle({+ color: "var(--mb-color-accent1)",+ });});it("should not render an icon if none is provided", async () => {diff --git a/frontend/src/metabase/palette/components/PaletteResults.tsx b/frontend/src/metabase/palette/components/PaletteResults.tsxindex 013488bdcb1..f759f1c4eaa 100644--- a/frontend/src/metabase/palette/components/PaletteResults.tsx+++ b/frontend/src/metabase/palette/components/PaletteResults.tsx@@ -197,10 +197,10 @@ function PaletteEmptyState() {return (<Stack align="center" justify="center" py="6rem" px="2rem" gap={0}><Image src={NoResults} alt="no results" w={115} h={65} />- <Text c="text-medium" fw={700} mt="xl">+ <Text c="text-secondary" fw={700} mt="xl">{t`No recent items`}</Text>- <Text c="text-light" size="sm" mt="xs" ta="center">+ <Text c="text-tertiary" size="sm" mt="xs" ta="center">{t`Items you've recently viewed will appear here.`}</Text></Stack>diff --git a/frontend/src/metabase/palette/utils.ts b/frontend/src/metabase/palette/utils.tsindex baee0544d9d..e350db7d198 100644--- a/frontend/src/metabase/palette/utils.ts+++ b/frontend/src/metabase/palette/utils.ts@@ -3,8 +3,8 @@ import type { MouseEvent } from "react";import { t } from "ttag";import _ from "underscore";+import type { ColorName } from "metabase/lib/colors/types";import type { IconName } from "metabase/ui";-import { color } from "metabase/ui/utils/colors";import type { RecentItem } from "metabase-types/api";import type { PaletteActionImpl } from "./types";@@ -85,12 +85,10 @@ export const filterRecentItems: (items: RecentItem[]) => RecentItem[] = (export const getCommandPaletteIcon = (item: PaletteActionImpl,-): { name: IconName; color: string } => {+): { name: IconName; c: ColorName } => {const icon = {name: item.icon as IconName,- color: item.extra?.iconColor- ? color(item.extra.iconColor)- : "var(--mb-color-brand)",+ c: item.extra?.iconColor || "brand",};return icon;diff --git a/frontend/src/metabase/parameters/components/ParameterLinkedFilters/ParameterLinkedFilters.tsx b/frontend/src/metabase/parameters/components/ParameterLinkedFilters/ParameterLinkedFilters.tsxindex 2741f0041cd..5a9411f688b 100644--- a/frontend/src/metabase/parameters/components/ParameterLinkedFilters/ParameterLinkedFilters.tsx+++ b/frontend/src/metabase/parameters/components/ParameterLinkedFilters/ParameterLinkedFilters.tsx@@ -302,7 +302,7 @@ const ParameterItem = ({const [isExpanded, setIsExpanded] = useState(false);return (- <Box className={S.parameterItem} bg="bg-light">+ <Box className={S.parameterItem} bg="background-secondary"><Group justify="space-between" align="center" pr="md"><Buttonc={isCompatible ? "text-primary" : undefined}diff --git a/frontend/src/metabase/parameters/components/ParameterSettings/MoveParameterMenu/MoveParameterMenu.module.css b/frontend/src/metabase/parameters/components/ParameterSettings/MoveParameterMenu/MoveParameterMenu.module.cssindex 4ba06b2881e..d71d21de4cc 100644--- a/frontend/src/metabase/parameters/components/ParameterSettings/MoveParameterMenu/MoveParameterMenu.module.css+++ b/frontend/src/metabase/parameters/components/ParameterSettings/MoveParameterMenu/MoveParameterMenu.module.css@@ -4,7 +4,7 @@cursor: pointer;&::placeholder {- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);font-weight: 700;}@@ -18,16 +18,16 @@}.MoveParameterMenuOptionIcon {- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);}.MoveParameterMenuOptionText {- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);}.MoveParameterMenuOption[aria-selected="true"] {.MoveParameterMenuOptionIcon,.MoveParameterMenuOptionText {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);}}diff --git a/frontend/src/metabase/parameters/components/ParameterSettings/ParameterSettings.module.css b/frontend/src/metabase/parameters/components/ParameterSettings/ParameterSettings.module.cssindex b5afcc80f57..f7ee3630b7c 100644--- a/frontend/src/metabase/parameters/components/ParameterSettings/ParameterSettings.module.css+++ b/frontend/src/metabase/parameters/components/ParameterSettings/ParameterSettings.module.css@@ -1,5 +1,5 @@.SettingLabel {- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);}.SettingLabelError {@@ -7,9 +7,9 @@}.SettingValueWidget {- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);padding: 0.75rem 0.75rem;border: 1px solid var(--mb-color-border);border-radius: 0.5rem;- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);}diff --git a/frontend/src/metabase/parameters/components/ParameterSettings/TemporalUnitSettings/TemporalUnitSettings.module.css b/frontend/src/metabase/parameters/components/ParameterSettings/TemporalUnitSettings/TemporalUnitSettings.module.cssindex e1eeb6380e1..e1bcfeac462 100644--- a/frontend/src/metabase/parameters/components/ParameterSettings/TemporalUnitSettings/TemporalUnitSettings.module.css+++ b/frontend/src/metabase/parameters/components/ParameterSettings/TemporalUnitSettings/TemporalUnitSettings.module.css@@ -4,7 +4,7 @@cursor: pointer;padding: 0.5rem;border-radius: 0.375rem;- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);&:hover {background-color: var(--mb-color-background-hover);diff --git a/frontend/src/metabase/parameters/components/ParameterValueWidget.module.css b/frontend/src/metabase/parameters/components/ParameterValueWidget.module.cssindex d92493a9553..440b2977b80 100644--- a/frontend/src/metabase/parameters/components/ParameterValueWidget.module.css+++ b/frontend/src/metabase/parameters/components/ParameterValueWidget.module.css@@ -4,7 +4,7 @@font-weight: 700;height: 32px;min-width: 120px;- background: var(--mb-color-background);+ background: var(--mb-color-background-primary);color: var(--mb-color-text-primary);border: 1px solid var(--mb-color-border);padding-left: var(--mantine-spacing-sm);@@ -72,7 +72,7 @@.parameter.noPopover input:focus {outline: none;- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);}.parameter.noPopover input::-webkit-input-placeholder {diff --git a/frontend/src/metabase/parameters/components/ParameterWidget/ParameterWidget.module.css b/frontend/src/metabase/parameters/components/ParameterWidget/ParameterWidget.module.cssindex 337757da5e7..6aaae273a0d 100644--- a/frontend/src/metabase/parameters/components/ParameterWidget/ParameterWidget.module.css+++ b/frontend/src/metabase/parameters/components/ParameterWidget/ParameterWidget.module.css@@ -1,7 +1,7 @@.EditingParameterContainer {transition: all 0.2s ease-in-out;border: 1px solid var(--mb-color-border);- background: var(--mb-color-background);+ background: var(--mb-color-background-primary);border-radius: var(--mantine-radius-sm);cursor: pointer;height: 32px;@@ -14,7 +14,7 @@&.isEditingParameter {border-color: var(--mb-color-brand);- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);background-color: var(--mb-color-brand);}}diff --git a/frontend/src/metabase/parameters/components/RequiredParamToggle/RequiredParamToggle.module.css b/frontend/src/metabase/parameters/components/RequiredParamToggle/RequiredParamToggle.module.cssindex 899e6f3b6a8..25cc55d4e1c 100644--- a/frontend/src/metabase/parameters/components/RequiredParamToggle/RequiredParamToggle.module.css+++ b/frontend/src/metabase/parameters/components/RequiredParamToggle/RequiredParamToggle.module.css@@ -4,6 +4,6 @@gap: 0.5rem;margin-top: 0.15rem;font-weight: 700;- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);cursor: pointer;}diff --git a/frontend/src/metabase/parameters/components/ValuesSourceModal/ValuesSourceTypeModal.module.css b/frontend/src/metabase/parameters/components/ValuesSourceModal/ValuesSourceTypeModal.module.cssindex c771a97ff0c..f122476d243 100644--- a/frontend/src/metabase/parameters/components/ValuesSourceModal/ValuesSourceTypeModal.module.css+++ b/frontend/src/metabase/parameters/components/ValuesSourceModal/ValuesSourceTypeModal.module.css@@ -1,5 +1,5 @@.info {- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);border-radius: var(--default-border-radius);}@@ -25,7 +25,7 @@.ModalLabel {display: block;- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);margin-bottom: 0.5rem;font-weight: bold;}@@ -36,13 +36,13 @@}.ModalHelpMessage {- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);margin-top: 0.25rem;margin-left: 1.25rem;}.ModalErrorMessage {- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);padding: 1rem;border: 1px solid var(--mb-color-error);border-radius: 0.5rem;@@ -56,8 +56,8 @@padding: 2rem;border: 1px solid var(--mb-color-border);border-radius: 0.5rem;- background-color: var(--mb-color-bg-light);- color: var(--mb-color-text-medium);+ background-color: var(--mb-color-background-secondary);+ color: var(--mb-color-text-secondary);font-weight: bold;line-height: 1.5rem;text-align: center;diff --git a/frontend/src/metabase/parameters/components/ValuesSourceModal/ValuesSourceTypeModal.tsx b/frontend/src/metabase/parameters/components/ValuesSourceModal/ValuesSourceTypeModal.tsxindex 9a89f2041e0..6ebde257f68 100644--- a/frontend/src/metabase/parameters/components/ValuesSourceModal/ValuesSourceTypeModal.tsx+++ b/frontend/src/metabase/parameters/components/ValuesSourceModal/ValuesSourceTypeModal.tsx@@ -457,7 +457,7 @@ function ModelHint() {return (<Box mt="lg" p="md" className={S.info}><Flex gap="md" align="center">- <Icon name="info" color="text-dark" className={S.icon} />+ <Icon name="info" c="text-primary" className={S.icon} /><div>{jt`If you find yourself doing value-label mapping often, you might want to ${link}.`}</div>diff --git a/frontend/src/metabase/parameters/components/WidgetStatus/WidgetStatus.tsx b/frontend/src/metabase/parameters/components/WidgetStatus/WidgetStatus.tsxindex cf9ccbdfe1d..a42a69a018e 100644--- a/frontend/src/metabase/parameters/components/WidgetStatus/WidgetStatus.tsx+++ b/frontend/src/metabase/parameters/components/WidgetStatus/WidgetStatus.tsx@@ -44,7 +44,7 @@ export const WidgetStatus = ({><Iconname="close"- color={highlighted ? undefined : "text-medium"}+ c={highlighted ? undefined : "text-secondary"}size={16}/></Box>@@ -63,7 +63,7 @@ export const WidgetStatus = ({><Iconname="revert"- color={highlighted ? undefined : "text-medium"}+ c={highlighted ? undefined : "text-secondary"}size={16}/></Box>diff --git a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/SingleSelectListField/SingleSelectListField.styled.tsx b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/SingleSelectListField/SingleSelectListField.styled.tsxindex 5f990011a7e..7876422482e 100644--- a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/SingleSelectListField/SingleSelectListField.styled.tsx+++ b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/SingleSelectListField/SingleSelectListField.styled.tsx@@ -50,7 +50,7 @@ export const OptionItem = styled.div<OptionItemProps>``: css`color: var(--mb-color-text-primary);- background-color: var(--mb-color-background);+ background-color: var(--mb-color-background-primary);`}&:hover {diff --git a/frontend/src/metabase/public/components/EmbedFrame/EmbedFrame.module.css b/frontend/src/metabase/public/components/EmbedFrame/EmbedFrame.module.cssindex fdb8723ba13..4befd11c9c3 100644--- a/frontend/src/metabase/public/components/EmbedFrame/EmbedFrame.module.css+++ b/frontend/src/metabase/public/components/EmbedFrame/EmbedFrame.module.css@@ -43,7 +43,7 @@ body:where(:global(.mb-wrapper)) {.ParameterPanel.IsSticky {background-color: color-mix(in srgb,- var(--mb-color-bg-white),+ var(--mb-color-background-primary),var(--mb-color-bg-dashboard) 15%);border-bottom-color: var(--mb-color-border);@@ -60,20 +60,22 @@ body:where(:global(.mb-wrapper)) {) {--mb-color-text-primary: color-mix(in srgb,- var(--mb-color-text-white) 90%,+ var(--mb-color-text-primary-inverse) 90%,transparent);--mb-color-text-secondary: color-mix(in srgb,- var(--mb-color-text-white) 65%,+ var(--mb-color-text-primary-inverse) 65%,transparent);--mb-color-text-tertiary: color-mix(in srgb,- var(--mb-color-text-white) 45%,+ var(--mb-color-text-primary-inverse) 45%,transparent);- --mb-color-bg-light: var(--mb-color-bg-darker);+ --mb-color-background-secondary: var(+ --mb-color-background-tertiary-inverseer+ );}.NoBackground {@@ -101,7 +103,7 @@ body:where(:global(.mb-wrapper)) {.ParameterPanel.IsSticky {background-color: color-mix(in srgb,- var(--mb-color-bg-white),+ var(--mb-color-background-primary),transparent 15%);border-bottom-color: transparent;diff --git a/frontend/src/metabase/public/components/EmbedFrame/EmbedFrame.styled.tsx b/frontend/src/metabase/public/components/EmbedFrame/EmbedFrame.styled.tsxindex 57b6e682fe1..b0aa74b75ae 100644--- a/frontend/src/metabase/public/components/EmbedFrame/EmbedFrame.styled.tsx+++ b/frontend/src/metabase/public/components/EmbedFrame/EmbedFrame.styled.tsx@@ -112,7 +112,7 @@ export const Body = styled.main``;export const ActionButtonsContainer = styled.div`- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);margin-left: auto;`;diff --git a/frontend/src/metabase/public/components/EmbedFrame/LogoBadge/LogoBadge.module.css b/frontend/src/metabase/public/components/EmbedFrame/LogoBadge/LogoBadge.module.cssindex 0f38fbbff9f..9e3d100de1b 100644--- a/frontend/src/metabase/public/components/EmbedFrame/LogoBadge/LogoBadge.module.css+++ b/frontend/src/metabase/public/components/EmbedFrame/LogoBadge/LogoBadge.module.css@@ -1,5 +1,5 @@.metabaseLink {- --mb-color-background: var(--mb-color-bg-light);+ --mb-color-background: var(--mb-color-background-secondary);/* SVG logo */--mb-color-logo-text: #5a6072;--mb-color-logo-primary: var(--mb-color-metabase-brand);@@ -13,17 +13,17 @@border: 1px solid var(--mb-color-border);border-radius: 0.75rem;padding: 0.4688rem 0.75rem;- background: var(--mb-color-background);+ background: var(--mb-color-background-primary);color: var(--mb-color-text-primary);}.light {- --mb-color-text-primary: var(--mb-color-text-medium);+ --mb-color-text-primary: var(--mb-color-text-secondary);}.dark {- --mb-color-border: var(--mb-color-text-medium);- --mb-color-background: #2f353a;+ --mb-color-border: var(--mb-color-text-secondary);+ --mb-color-background-primary: #2f353a;/* SVG logo */--mb-color-logo-text: var(--mb-color-text-primary);--mb-color-logo-primary: var(--mb-color-text-primary);diff --git a/frontend/src/metabase/public/components/EmbedModal/EmbedModal.styled.tsx b/frontend/src/metabase/public/components/EmbedModal/EmbedModal.styled.tsxindex ad0daac3eb6..52fe8f57bf2 100644--- a/frontend/src/metabase/public/components/EmbedModal/EmbedModal.styled.tsx+++ b/frontend/src/metabase/public/components/EmbedModal/EmbedModal.styled.tsx@@ -5,6 +5,6 @@ import { ModalHeader } from "metabase/common/components/ModalContent";export const EmbedModalHeader = styled(ModalHeader)`padding: 1.5rem 2rem;- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);border-bottom: 1px solid var(--mb-color-border);`;diff --git a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/StaticEmbedSetupPane.styled.tsx b/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/StaticEmbedSetupPane.styled.tsxindex 0e845f27c2a..7b9e771f09e 100644--- a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/StaticEmbedSetupPane.styled.tsx+++ b/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/StaticEmbedSetupPane.styled.tsx@@ -16,7 +16,7 @@ const SettingsAsideBlock = styled.div`width: 21.6rem;padding: 2rem;border-right: 1px solid var(--mb-color-border);- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);height: 45.125rem;overflow-y: auto;`;@@ -31,7 +31,7 @@ const PreviewAreaBlock = styled.div`justify-content: stretch;gap: 1rem;padding: 1rem 1.5rem 2rem 1rem;- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);`;export const SettingsTabLayout = ({diff --git a/frontend/src/metabase/public/components/widgets/LegaleseStep/LegaleseStep.tsx b/frontend/src/metabase/public/components/widgets/LegaleseStep/LegaleseStep.tsxindex d14d21268d4..200d9cfeafb 100644--- a/frontend/src/metabase/public/components/widgets/LegaleseStep/LegaleseStep.tsx+++ b/frontend/src/metabase/public/components/widgets/LegaleseStep/LegaleseStep.tsx@@ -24,7 +24,7 @@ export const LegaleseStep = ({};return (- <Center bg="bg-white" px="18rem" pt="6.25rem" pb="11.75rem">+ <Center bg="background-primary" px="18rem" pt="6.25rem" pb="11.75rem"><Stack align="center" gap="3rem"><Title order={3} fz="1.25rem">{t`First, some legalese`}</Title>diff --git a/frontend/src/metabase/public/containers/PublicAction/PublicAction.styled.tsx b/frontend/src/metabase/public/containers/PublicAction/PublicAction.styled.tsxindex af246748e83..fc18ba1e45e 100644--- a/frontend/src/metabase/public/containers/PublicAction/PublicAction.styled.tsx+++ b/frontend/src/metabase/public/containers/PublicAction/PublicAction.styled.tsx@@ -39,7 +39,7 @@ const titleStyle = css`font-weight: 700;font-size: 1.125rem;line-height: 1.375rem;- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);`;export const FormTitle = styled.h1`diff --git a/frontend/src/metabase/public/containers/PublicDocument/PublicDocument.module.css b/frontend/src/metabase/public/containers/PublicDocument/PublicDocument.module.cssindex 336330f3378..64917704e1f 100644--- a/frontend/src/metabase/public/containers/PublicDocument/PublicDocument.module.css+++ b/frontend/src/metabase/public/containers/PublicDocument/PublicDocument.module.css@@ -14,7 +14,7 @@.editorContent :global(.ProseMirror) {padding: 1.5rem 0 2rem 0;outline: none;- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);font-size: 1rem;line-height: 1.5;}@@ -26,7 +26,7 @@:global(.editor-style-boundary) *) {font-weight: 700;- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);}.editorContent@@ -119,20 +119,20 @@.editorContent:global(.ProseMirror):global(code):not(:global(.editor-style-boundary) *) {- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);padding: 0.125rem 0.375rem;border-radius: var(--mantine-radius-xs);font-family: var(--mb-default-monospace-font-family, monospace);font-size: 0.875rem;- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);border: 1px solid var(--mb-color-border);}.editorContent:global(.ProseMirror):global(pre):not(:global(.editor-style-boundary) *) {- background-color: var(--mb-color-bg-light);- color: var(--mb-color-text-dark);+ background-color: var(--mb-color-background-secondary);+ color: var(--mb-color-text-primary);padding: 1rem;border-radius: var(--mantine-radius-sm);overflow-x: auto;@@ -156,9 +156,9 @@:global(blockquote):not(:global(.editor-style-boundary) *) {border-left: 3px solid var(--mb-color-border);margin: 0 0 1rem 0;- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);font-style: italic;- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);padding: 1rem;padding-left: 1.25rem;border-radius: var(--mantine-radius-xs);diff --git a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView.stories.tsx b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView.stories.tsxindex a6d182a6728..695404b02fd 100644--- a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView.stories.tsx+++ b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardView.stories.tsx@@ -374,7 +374,7 @@ export function ComponentCompatibility() {<Box pb="50px"><Tooltiplabel={- <Text size="sm" c="var(--mb-color-text-primary)">+ <Text size="sm" c="text-primary">Label</Text>}@@ -391,7 +391,7 @@ export function ComponentCompatibility() {</Card></Popover.Target><Popover.Dropdown>- <Text size="sm" c="var(--mb-color-text-primary)">+ <Text size="sm" c="text-primary">Dropdown</Text></Popover.Dropdown>diff --git a/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestionView.stories.tsx b/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestionView.stories.tsxindex 3b716657ced..17abce8ecfa 100644--- a/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestionView.stories.tsx+++ b/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestionView.stories.tsx@@ -195,7 +195,7 @@ export const TransparentThemeDefault = {function LightBackgroundDecorator(Story: StoryFn) {return (- <Box bg="#ddd" h="100%">+ <Box bg="background-primary" h="100%"><Story /></Box>);diff --git a/frontend/src/metabase/query_builder/components/DataSelector/DataSelector.module.css b/frontend/src/metabase/query_builder/components/DataSelector/DataSelector.module.cssindex 2ccdae3b7a7..aa541bec056 100644--- a/frontend/src/metabase/query_builder/components/DataSelector/DataSelector.module.css+++ b/frontend/src/metabase/query_builder/components/DataSelector/DataSelector.module.css@@ -20,7 +20,7 @@.TextSchema {font-size: 0.75em;- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);line-height: 0.75rem;text-transform: uppercase;letter-spacing: 0.06em;@@ -28,7 +28,7 @@.BackButtonLabel {font-size: 16px;- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);margin-left: 0.5rem;overflow-wrap: anywhere;word-break: break-word;diff --git a/frontend/src/metabase/query_builder/components/DataSelector/DataSelectorDataBucketPicker/DataSelectorDataBucketPicker.module.css b/frontend/src/metabase/query_builder/components/DataSelector/DataSelectorDataBucketPicker/DataSelectorDataBucketPicker.module.cssindex ad006ae7111..5435a76b1ea 100644--- a/frontend/src/metabase/query_builder/components/DataSelector/DataSelectorDataBucketPicker/DataSelectorDataBucketPicker.module.css+++ b/frontend/src/metabase/query_builder/components/DataSelector/DataSelectorDataBucketPicker/DataSelectorDataBucketPicker.module.css@@ -3,20 +3,20 @@}.DataBucketListItemTitle {- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);font-weight: 700;font-size: 14px;margin-left: 0.5rem;}.DataBucketListItemDescription {- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);font-weight: 700;font-size: 12px;}.DataBucketListItemIcon {- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);}.DataBucketListItemContainer {@@ -24,7 +24,7 @@.DataBucketListItemDescription,.DataBucketListItemTitle,.DataBucketListItemIcon {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);}}}diff --git a/frontend/src/metabase/query_builder/components/DataSelector/DataSelectorFieldPicker/DataSelectorFieldPicker.module.css b/frontend/src/metabase/query_builder/components/DataSelector/DataSelectorFieldPicker/DataSelectorFieldPicker.module.cssindex b0f621f0f43..6813c0f3d0a 100644--- a/frontend/src/metabase/query_builder/components/DataSelector/DataSelectorFieldPicker/DataSelectorFieldPicker.module.css+++ b/frontend/src/metabase/query_builder/components/DataSelector/DataSelectorFieldPicker/DataSelectorFieldPicker.module.css@@ -4,7 +4,7 @@.HeaderContainer {align-items: center;- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);cursor: pointer;display: flex;gap: 0.5rem;diff --git a/frontend/src/metabase/query_builder/components/DataSelector/DataSelectorSectionHeader/DataSelectorSectionHeader.module.css b/frontend/src/metabase/query_builder/components/DataSelector/DataSelectorSectionHeader/DataSelectorSectionHeader.module.cssindex 532c32b13fd..43b2a6be39e 100644--- a/frontend/src/metabase/query_builder/components/DataSelector/DataSelectorSectionHeader/DataSelectorSectionHeader.module.css+++ b/frontend/src/metabase/query_builder/components/DataSelector/DataSelectorSectionHeader/DataSelectorSectionHeader.module.css@@ -3,5 +3,5 @@}.Header {- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);}diff --git a/frontend/src/metabase/query_builder/components/DataSelector/DataSelectorTablePicker/DataSelectorTablePicker.tsx b/frontend/src/metabase/query_builder/components/DataSelector/DataSelectorTablePicker/DataSelectorTablePicker.tsxindex 5cc84a7b57c..7fe7d50ea06 100644--- a/frontend/src/metabase/query_builder/components/DataSelector/DataSelectorTablePicker/DataSelectorTablePicker.tsx+++ b/frontend/src/metabase/query_builder/components/DataSelector/DataSelectorTablePicker/DataSelectorTablePicker.tsx@@ -162,7 +162,7 @@ const LinkToDocsOnReferencingSavedQuestionsInQueries = () => {<Boxp="md"ta="center"- bg="bg-light"+ bg="background-secondary"style={{borderTop: "1px solid var(--mb-color-border)",}}@@ -195,10 +195,10 @@ const Header = ({{selectedSchema?.name && schemas.length > 1 && (<>- <Box component="span" mx="sm" c="text-medium">+ <Box component="span" mx="sm" c="text-secondary">/</Box>- <Box component="span" data-testid="source-schema" c="text-medium">+ <Box component="span" data-testid="source-schema" c="text-secondary">{selectedSchema.displayName()}</Box></>diff --git a/frontend/src/metabase/query_builder/components/DataSelector/saved-entity-picker/SavedEntityPicker.module.css b/frontend/src/metabase/query_builder/components/DataSelector/saved-entity-picker/SavedEntityPicker.module.cssindex eb2d6662626..f0f59fdbf7b 100644--- a/frontend/src/metabase/query_builder/components/DataSelector/saved-entity-picker/SavedEntityPicker.module.css+++ b/frontend/src/metabase/query_builder/components/DataSelector/saved-entity-picker/SavedEntityPicker.module.css@@ -15,7 +15,7 @@display: flex;flex-direction: column;min-width: 310px;- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);overflow: auto;@media screen and (max-width: 40em) {@@ -29,7 +29,7 @@font-size: 16px;display: flex;align-items: center;- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);border-bottom: 1px solid var(--mb-color-border);padding: 1rem;diff --git a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditor.module.css b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditor.module.cssindex 7af2467b8ae..b346936abd2 100644--- a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditor.module.css+++ b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditor.module.css@@ -25,7 +25,7 @@.FieldTypeIcon {background-color: var(--mb-color-brand);- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);border-radius: 0.3em;padding: 0.2em;margin-right: 8px;@@ -33,7 +33,7 @@flex-shrink: 0;&.isSelected {- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);color: var(--mb-color-brand);}}@@ -52,7 +52,7 @@display: flex;flex: 1 0 auto;position: relative;- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);height: calc(100vh - var(--edit-bar-height));}@@ -79,16 +79,16 @@transition: all 0.25s;&.isSelected {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);background-color: var(--mb-color-brand);}&:hover {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);background-color: var(--mb-color-brand);.FieldTypeIcon {- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);color: var(--mb-color-brand);}}diff --git a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorSettingsSidebar/ListViewColumnsSidebar.tsx b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorSettingsSidebar/ListViewColumnsSidebar.tsxindex 402b82e90b5..f4a554826ab 100644--- a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorSettingsSidebar/ListViewColumnsSidebar.tsx+++ b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetEditorSettingsSidebar/ListViewColumnsSidebar.tsx@@ -80,7 +80,7 @@ export function ListViewColumnsSidebar({<Stack gap="md"><TextInputplaceholder={t`Find a column...`}- leftSection={<Icon name="search" size={14} c="text-light" />}+ leftSection={<Icon name="search" size={14} c="text-tertiary" />}value={query}onChange={(e) => setQuery(e.currentTarget.value)}/>@@ -98,7 +98,7 @@ export function ListViewColumnsSidebar({/>))}{filtered.length === 0 ? (- <Text size="sm" c="text-light">{t`No available columns`}</Text>+ <Text size="sm" c="text-tertiary">{t`No available columns`}</Text>) : null}</Stack></Stack>{" "}diff --git a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetFieldMetadataSidebar/DatasetFieldMetadataSidebar.jsx b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetFieldMetadataSidebar/DatasetFieldMetadataSidebar.jsxindex bb699784049..2e6ce83d302 100644--- a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetFieldMetadataSidebar/DatasetFieldMetadataSidebar.jsx+++ b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetFieldMetadataSidebar/DatasetFieldMetadataSidebar.jsx@@ -245,7 +245,7 @@ function DatasetFieldMetadataSidebar({left: "0.75rem",top: "0.5rem",fontSize: "0.625rem",- color: color("text-light"),+ color: color("text-tertiary"),whiteSpace: "nowrap",overflow: "hidden",textOverflow: "ellipsis",diff --git a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetFieldMetadataSidebar/DatasetFieldMetadataSidebar.module.css b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetFieldMetadataSidebar/DatasetFieldMetadataSidebar.module.cssindex f8ce2b1e7ff..375728f11c0 100644--- a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetFieldMetadataSidebar/DatasetFieldMetadataSidebar.module.css+++ b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetFieldMetadataSidebar/DatasetFieldMetadataSidebar.module.css@@ -1,14 +1,14 @@.Divider {height: 1px;width: 100%;- background-color: var(--mb-color-bg-medium);+ background-color: var(--mb-color-background-tertiary);}.MainFormContainer {padding: 1.5rem 1.5rem 0;.SelectButton {- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);transition: border 0.3s;outline: none;diff --git a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetFieldMetadataSidebar/MappedFieldPicker/MappedFieldPicker.module.css b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetFieldMetadataSidebar/MappedFieldPicker/MappedFieldPicker.module.cssindex d9c56099a77..bf5c0a03be2 100644--- a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetFieldMetadataSidebar/MappedFieldPicker/MappedFieldPicker.module.css+++ b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetFieldMetadataSidebar/MappedFieldPicker/MappedFieldPicker.module.css@@ -4,12 +4,12 @@border-color: var(--mb-color-brand);.StyledSelectIcon {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);}/* this class is needed because of high specificity of SelectButton.Content */.StyledSelectButtonContent {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);}}}diff --git a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetFieldMetadataSidebar/MappedFieldPicker/MappedFieldPicker.tsx b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetFieldMetadataSidebar/MappedFieldPicker/MappedFieldPicker.tsxindex 0e730e9849b..a10094d6607 100644--- a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetFieldMetadataSidebar/MappedFieldPicker/MappedFieldPicker.tsx+++ b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetFieldMetadataSidebar/MappedFieldPicker/MappedFieldPicker.tsx@@ -100,7 +100,7 @@ function MappedFieldPicker({return (<>- <Text fw="bold" c="text-medium">+ <Text fw="bold" c="text-secondary">{label}</Text><SchemaTableAndFieldDataSelectordiff --git a/frontend/src/metabase/query_builder/components/DatasetEditor/EditorTabs/EditorTabs.module.css b/frontend/src/metabase/query_builder/components/DatasetEditor/EditorTabs/EditorTabs.module.cssindex cdf5acb8c33..ff95ad6808a 100644--- a/frontend/src/metabase/query_builder/components/DatasetEditor/EditorTabs/EditorTabs.module.css+++ b/frontend/src/metabase/query_builder/components/DatasetEditor/EditorTabs/EditorTabs.module.css@@ -25,7 +25,7 @@justify-content: center;align-items: center;padding: 6px 12px;- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);font-weight: bold;border: 2px solid;border-radius: 8px;diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/CodeMirrorEditor/CodeMirrorEditor.module.css b/frontend/src/metabase/query_builder/components/NativeQueryEditor/CodeMirrorEditor/CodeMirrorEditor.module.cssindex eb36ad7cad2..b5063b8a416 100644--- a/frontend/src/metabase/query_builder/components/NativeQueryEditor/CodeMirrorEditor/CodeMirrorEditor.module.css+++ b/frontend/src/metabase/query_builder/components/NativeQueryEditor/CodeMirrorEditor/CodeMirrorEditor.module.css@@ -10,19 +10,19 @@max-width: 100%;flex-shrink: 1;height: 100%;- color: var(--mb-color-text-dark);- background-color: var(--mb-color-bg-light);+ color: var(--mb-color-text-primary);+ background-color: var(--mb-color-background-secondary);:global {/* merge view styles */.cm-collapsedLines {- background: var(--mb-color-bg-light) !important;- color: var(--mb-color-text-light);+ background: var(--mb-color-background-secondary) !important;+ color: var(--mb-color-text-tertiary);&:before,&:after {content: "-";- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);}}diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditor.module.css b/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditor.module.cssindex ab9fb269bfd..88ca97f0bfb 100644--- a/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditor.module.css+++ b/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditor.module.css@@ -1,6 +1,6 @@.queryEditor {width: 100%;- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);}.dragHandleContainer {diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/RightClickPopover/RightClickPopover.module.css b/frontend/src/metabase/query_builder/components/NativeQueryEditor/RightClickPopover/RightClickPopover.module.cssindex 596210b5f18..ee64ec61757 100644--- a/frontend/src/metabase/query_builder/components/NativeQueryEditor/RightClickPopover/RightClickPopover.module.css+++ b/frontend/src/metabase/query_builder/components/NativeQueryEditor/RightClickPopover/RightClickPopover.module.css@@ -3,6 +3,6 @@padding: 1rem;&:hover {- background-color: var(--mb-color-bg-medium);+ background-color: var(--mb-color-background-tertiary);}}diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/VisibilityToggler/VisibilityToggler.module.css b/frontend/src/metabase/query_builder/components/NativeQueryEditor/VisibilityToggler/VisibilityToggler.module.cssindex 555da274517..ed7f0f8f47c 100644--- a/frontend/src/metabase/query_builder/components/NativeQueryEditor/VisibilityToggler/VisibilityToggler.module.css+++ b/frontend/src/metabase/query_builder/components/NativeQueryEditor/VisibilityToggler/VisibilityToggler.module.css@@ -1,5 +1,5 @@.ToggleContent {- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);font-size: 10px;font-weight: 700;text-decoration: none;diff --git a/frontend/src/metabase/query_builder/components/NewDatasetModal/NewDatasetModal.module.css b/frontend/src/metabase/query_builder/components/NewDatasetModal/NewDatasetModal.module.cssindex 2ec1d1e2f2b..5edb17079b4 100644--- a/frontend/src/metabase/query_builder/components/NewDatasetModal/NewDatasetModal.module.css+++ b/frontend/src/metabase/query_builder/components/NewDatasetModal/NewDatasetModal.module.css@@ -1,5 +1,5 @@.DatasetValueProp {- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);list-style-type: disc;margin-left: 1rem;padding-bottom: 1rem;diff --git a/frontend/src/metabase/query_builder/components/QueryVisualization.jsx b/frontend/src/metabase/query_builder/components/QueryVisualization.jsxindex b3be9ea2165..5185d0db362 100644--- a/frontend/src/metabase/query_builder/components/QueryVisualization.jsx+++ b/frontend/src/metabase/query_builder/components/QueryVisualization.jsx@@ -114,13 +114,13 @@ const VisualizationEmptyState = ({ children }) => {<Box maw="3rem" mb="0.75rem"><img src={EmptyCodeResult} alt="Code prompt icon" /></Box>- <Text c="text-medium">+ <Text c="text-secondary">{c("{0} refers to the keyboard shortcut").jt`To run your code, click on the Run button or type ${(<b key="shortcut">({keyboardShortcut})</b>)}`}</Text>- <Text c="text-medium">{children}</Text>+ <Text c="text-secondary">{children}</Text></Stack></Flex>);@@ -193,7 +193,7 @@ export const VisualizationDirtyState = ({isRunning={isRunning}isDirty={isResultDirty}/>- {!hidden && <Text c="text-medium">{keyboardShortcut}</Text>}+ {!hidden && <Text c="text-secondary">{keyboardShortcut}</Text>}</Flex>);};diff --git a/frontend/src/metabase/query_builder/components/QuestionDownloadWidget/QuestionDownloadWidget.tsx b/frontend/src/metabase/query_builder/components/QuestionDownloadWidget/QuestionDownloadWidget.tsxindex 2e64f9ca1fb..71a3b0725f4 100644--- a/frontend/src/metabase/query_builder/components/QuestionDownloadWidget/QuestionDownloadWidget.tsx+++ b/frontend/src/metabase/query_builder/components/QuestionDownloadWidget/QuestionDownloadWidget.tsx@@ -169,12 +169,12 @@ export const QuestionDownloadWidget = ({{showPivotXlsxExportHint && (<Flexp="md"- bg="var(--mb-color-background-light)"+ bg="background-secondary"align="center"justify="space-between"className={CS.rounded}>- <Text fz="12px" lh="16px" c="text-medium">+ <Text fz="12px" lh="16px" c="text-secondary">{t`Trying to pivot this data in Excel? You should download the raw data instead.`}{" "}<Linktarget="_new"@@ -194,7 +194,7 @@ export const QuestionDownloadWidget = ({><Iconname="close"- c="text-medium"+ c="text-secondary"tooltip={t`Don't show me this again.`}onClick={() => setDismissedExcelPivotExportsBanner(true)}/>@@ -205,12 +205,12 @@ export const QuestionDownloadWidget = ({<Box><Textsize="sm"- c="text-medium"+ c="text-secondary"mb="1rem">{t`Your answer has a large number of rows so it could take a while to download.`}</Text>{format === "xlsx" && (- <Text size="sm" c="text-medium">+ <Text size="sm" c="text-secondary">{limitedDownloadSizeText}</Text>)}diff --git a/frontend/src/metabase/query_builder/components/ResponsiveParametersList.module.css b/frontend/src/metabase/query_builder/components/ResponsiveParametersList.module.cssindex 939679a84f9..593180ddb1c 100644--- a/frontend/src/metabase/query_builder/components/ResponsiveParametersList.module.css+++ b/frontend/src/metabase/query_builder/components/ResponsiveParametersList.module.css@@ -8,7 +8,7 @@}.ParametersListContainer {- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);&.isSmallScreen {position: absolute;diff --git a/frontend/src/metabase/query_builder/components/SidebarHeader/SidebarHeader.module.css b/frontend/src/metabase/query_builder/components/SidebarHeader/SidebarHeader.module.cssindex 22b3a300b59..bbbd68f9922 100644--- a/frontend/src/metabase/query_builder/components/SidebarHeader/SidebarHeader.module.css+++ b/frontend/src/metabase/query_builder/components/SidebarHeader/SidebarHeader.module.css@@ -1,5 +1,5 @@.CloseButton {- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);text-decoration: none;&:hover {@@ -23,7 +23,7 @@.defaultBackButton {cursor: pointer;- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);font-size: 0.83em;text-transform: uppercase;letter-spacing: 0.06em;diff --git a/frontend/src/metabase/query_builder/components/VisualizationError/VisualizationError.module.css b/frontend/src/metabase/query_builder/components/VisualizationError/VisualizationError.module.cssindex 626ba3bc194..34afe6997e8 100644--- a/frontend/src/metabase/query_builder/components/VisualizationError/VisualizationError.module.css+++ b/frontend/src/metabase/query_builder/components/VisualizationError/VisualizationError.module.css@@ -1,6 +1,6 @@.QueryErrorTitle {flex: 1 1 auto;- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);font-size: 1.25rem;line-height: 1.5rem;font-weight: bold;@@ -23,7 +23,7 @@line-height: 1.125rem;border: 1px solid var(--mb-color-brand);border-radius: 0.5rem;- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);overflow-wrap: break-word;}diff --git a/frontend/src/metabase/query_builder/components/chart-type-selector/ChartTypeOption/ChartTypeOption.tsx b/frontend/src/metabase/query_builder/components/chart-type-selector/ChartTypeOption/ChartTypeOption.tsxindex 9cf172148fe..b403e33a27f 100644--- a/frontend/src/metabase/query_builder/components/chart-type-selector/ChartTypeOption/ChartTypeOption.tsx+++ b/frontend/src/metabase/query_builder/components/chart-type-selector/ChartTypeOption/ChartTypeOption.tsx@@ -54,7 +54,7 @@ export const ChartTypeOption = ({><Iconname={visualization.iconName}- color={isSelected ? "white" : "brand"}+ c={isSelected ? "white" : "brand"}size={20}/></ActionIcon>@@ -65,9 +65,9 @@ export const ChartTypeOption = ({top="-0.5rem"right="-0.6rem"radius="xl"- color="text-light"+ color="text-tertiary"variant="viewHeader"- bg="bg-white"+ bg="background-primary"className={cx(ChartTypeOptionS.BorderedButton,ChartTypeOptionS.SettingsButton,@@ -83,7 +83,7 @@ export const ChartTypeOption = ({ta="center"fw="bold"fz="sm"- color={isSelected ? "brand" : "text-medium"}+ color={isSelected ? "brand" : "text-secondary"}data-testid="chart-type-option-label">{visualization.getUiName()}diff --git a/frontend/src/metabase/query_builder/components/chart-type-selector/ChartTypeSettings/ChartTypeSettings.tsx b/frontend/src/metabase/query_builder/components/chart-type-selector/ChartTypeSettings/ChartTypeSettings.tsxindex 53cde926517..ad4b62f6c22 100644--- a/frontend/src/metabase/query_builder/components/chart-type-selector/ChartTypeSettings/ChartTypeSettings.tsx+++ b/frontend/src/metabase/query_builder/components/chart-type-selector/ChartTypeSettings/ChartTypeSettings.tsx@@ -34,7 +34,7 @@ export const ChartTypeSettings = ({<Textfw="bold"- color="text-medium"+ color="text-secondary"tt="uppercase"fz="sm">{t`Other charts`}</Text>diff --git a/frontend/src/metabase/query_builder/components/dataref/NodeList.module.css b/frontend/src/metabase/query_builder/components/dataref/NodeList.module.cssindex 97c5af5368a..0e5b9896b7e 100644--- a/frontend/src/metabase/query_builder/components/dataref/NodeList.module.css+++ b/frontend/src/metabase/query_builder/components/dataref/NodeList.module.css@@ -26,7 +26,7 @@text-decoration: none;&:hover {- background-color: var(--mb-color-bg-medium);+ background-color: var(--mb-color-background-tertiary);}&.isDisabled {@@ -45,5 +45,5 @@}.NodeListItemId {- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);}diff --git a/frontend/src/metabase/query_builder/components/dataref/QuestionPane/QuestionPane.tsx b/frontend/src/metabase/query_builder/components/dataref/QuestionPane/QuestionPane.tsxindex 3a1ecc1d54f..e9c4eaddced 100644--- a/frontend/src/metabase/query_builder/components/dataref/QuestionPane/QuestionPane.tsx+++ b/frontend/src/metabase/query_builder/components/dataref/QuestionPane/QuestionPane.tsx@@ -100,12 +100,7 @@ export const QuestionPane = ({<EmptyDescription>{t`No description`}</EmptyDescription>)}</Box>- <Flex- color="var(--mb-color-text-medium)"- align="center"- p="0.25rem 0.5rem"- fw={700}- >+ <Flex color="text-secondary" align="center" p="0.25rem 0.5rem" fw={700}><aclassName={S.QuestionPaneDetailLink}href={ML_Urls.getUrl(question)}@@ -116,12 +111,7 @@ export const QuestionPane = ({<NodeListTitleText>{t`See it`}</NodeListTitleText></a></Flex>- <Flex- color="var(--mb-color-text-medium)"- align="center"- p="0.25rem 0.5rem"- fw={700}- >+ <Flex color="text-secondary" align="center" p="0.25rem 0.5rem" fw={700}><Icon className={S.QuestionPaneIcon} name="label" /><Boxcomponent="span"@@ -129,12 +119,7 @@ export const QuestionPane = ({fw="normal">{t`ID #${question.id()}`}</Box></Flex>- <Flex- color="var(--mb-color-text-medium)"- align="center"- p="0.25rem 0.5rem"- fw={700}- >+ <Flex color="text-secondary" align="center" p="0.25rem 0.5rem" fw={700}><Icon className={S.QuestionPaneIcon} name="collection" /><Box component="span" ml="sm" fw="normal">{collection?.name ?? t`Our analytics`}@@ -142,7 +127,7 @@ export const QuestionPane = ({</Flex>{question.lastEditInfo() && (<Flex- color="var(--mb-color-text-medium)"+ color="text-secondary"align="center"p="0.25rem 0.5rem"fw={700}diff --git a/frontend/src/metabase/query_builder/components/expressions/CombineColumns/ColumnAndSeparatorRow/ColumnAndSeparatorRow.tsx b/frontend/src/metabase/query_builder/components/expressions/CombineColumns/ColumnAndSeparatorRow/ColumnAndSeparatorRow.tsxindex 9e362fbbb15..2793230b69c 100644--- a/frontend/src/metabase/query_builder/components/expressions/CombineColumns/ColumnAndSeparatorRow/ColumnAndSeparatorRow.tsx+++ b/frontend/src/metabase/query_builder/components/expressions/CombineColumns/ColumnAndSeparatorRow/ColumnAndSeparatorRow.tsx@@ -129,7 +129,7 @@ function SeparatorInput({}}/>{!hasFocus && formatSeparator(value) !== value && (- <Text color="text-light" className={styles.placeholder}>+ <Text color="text-tertiary" className={styles.placeholder}>{formatSeparator(value)}</Text>)}diff --git a/frontend/src/metabase/query_builder/components/expressions/CombineColumns/ColumnAndSeparatorRow/ColumnInput.module.css b/frontend/src/metabase/query_builder/components/expressions/CombineColumns/ColumnAndSeparatorRow/ColumnInput.module.cssindex 2cbb16d541d..ed1e1ec8975 100644--- a/frontend/src/metabase/query_builder/components/expressions/CombineColumns/ColumnAndSeparatorRow/ColumnInput.module.css+++ b/frontend/src/metabase/query_builder/components/expressions/CombineColumns/ColumnAndSeparatorRow/ColumnInput.module.css@@ -9,7 +9,7 @@ button.root {}&:hover .button {- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);}&.open,diff --git a/frontend/src/metabase/query_builder/components/expressions/CombineColumns/ColumnAndSeparatorRow/ColumnInput.tsx b/frontend/src/metabase/query_builder/components/expressions/CombineColumns/ColumnAndSeparatorRow/ColumnInput.tsxindex ddc405e9585..53394e762bd 100644--- a/frontend/src/metabase/query_builder/components/expressions/CombineColumns/ColumnAndSeparatorRow/ColumnInput.tsx+++ b/frontend/src/metabase/query_builder/components/expressions/CombineColumns/ColumnAndSeparatorRow/ColumnInput.tsx@@ -100,7 +100,7 @@ export function ColumnInput({label: {marginBottom: theme.spacing?.xs,fontSize: theme.fontSizes?.md,- color: color("text-medium"),+ color: color("text-secondary"),},}}>diff --git a/frontend/src/metabase/query_builder/components/expressions/CombineColumns/Example.tsx b/frontend/src/metabase/query_builder/components/expressions/CombineColumns/Example.tsxindex 2a76e50e9d3..0c316aead59 100644--- a/frontend/src/metabase/query_builder/components/expressions/CombineColumns/Example.tsx+++ b/frontend/src/metabase/query_builder/components/expressions/CombineColumns/Example.tsx@@ -14,10 +14,10 @@ export const Example = ({ columnsAndSeparators }: Props) => {return (<Stack gap="sm">- <Text color="text-medium" lh={1} fw="bold">{t`Example`}</Text>+ <Text color="text-secondary" lh={1} fw="bold">{t`Example`}</Text><Card- bg="bg-light"+ bg="background-secondary"component={ScrollArea}p="sm"radius="xs"diff --git a/frontend/src/metabase/query_builder/components/expressions/Editor/Editor.module.css b/frontend/src/metabase/query_builder/components/expressions/Editor/Editor.module.cssindex cae16b212f0..6295153dbf6 100644--- a/frontend/src/metabase/query_builder/components/expressions/Editor/Editor.module.css+++ b/frontend/src/metabase/query_builder/components/expressions/Editor/Editor.module.css@@ -5,7 +5,7 @@flex-direction: column;&.formatting {- background-color: var(--mb-color-bg-medium);+ background-color: var(--mb-color-background-tertiary);}}@@ -29,7 +29,7 @@overflow: auto;height: 100%;box-sizing: border-box;- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);margin-right: calc(28px + var(--mantine-spacing-sm));:global {diff --git a/frontend/src/metabase/query_builder/components/expressions/Editor/HelpText/HelpText.module.css b/frontend/src/metabase/query_builder/components/expressions/Editor/HelpText/HelpText.module.cssindex f202e3abb52..dbcdd4d2887 100644--- a/frontend/src/metabase/query_builder/components/expressions/Editor/HelpText/HelpText.module.css+++ b/frontend/src/metabase/query_builder/components/expressions/Editor/HelpText/HelpText.module.css@@ -46,7 +46,7 @@padding: 0.5rem;overflow: auto;border-top: 1px solid var(--mb-color-border);- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);height: calc(50% - 2.5rem);&:last-child {diff --git a/frontend/src/metabase/query_builder/components/expressions/Editor/Listbox/Listbox.module.css b/frontend/src/metabase/query_builder/components/expressions/Editor/Listbox/Listbox.module.cssindex f583990430e..ea71afe6c57 100644--- a/frontend/src/metabase/query_builder/components/expressions/Editor/Listbox/Listbox.module.css+++ b/frontend/src/metabase/query_builder/components/expressions/Editor/Listbox/Listbox.module.css@@ -43,7 +43,7 @@.footer {box-sizing: border-box;height: 2.5rem;- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);padding: 0.5rem 1rem;display: flex;align-items: center;@@ -57,7 +57,7 @@padding: 6px;display: inline-block;border-radius: 6px;- background-color: var(--mb-color-bg-medium);+ background-color: var(--mb-color-background-tertiary);height: 24px;width: 24px;margin: 0 4px;diff --git a/frontend/src/metabase/query_builder/components/expressions/Editor/Tooltip/Tooltip.module.css b/frontend/src/metabase/query_builder/components/expressions/Editor/Tooltip/Tooltip.module.cssindex 30dabecf49d..2e75e50fd20 100644--- a/frontend/src/metabase/query_builder/components/expressions/Editor/Tooltip/Tooltip.module.css+++ b/frontend/src/metabase/query_builder/components/expressions/Editor/Tooltip/Tooltip.module.css@@ -17,7 +17,7 @@}.tooltip {- background: var(--mb-color-background);+ background: var(--mb-color-background-primary);z-index: 1000;width: 400px;max-height: 500px;diff --git a/frontend/src/metabase/query_builder/components/expressions/ExpressionWidget/ExpressionWidgetHeader.module.css b/frontend/src/metabase/query_builder/components/expressions/ExpressionWidget/ExpressionWidgetHeader.module.cssindex 616a8163848..8a29bd2c561 100644--- a/frontend/src/metabase/query_builder/components/expressions/ExpressionWidget/ExpressionWidgetHeader.module.css+++ b/frontend/src/metabase/query_builder/components/expressions/ExpressionWidget/ExpressionWidgetHeader.module.css@@ -1,5 +1,5 @@.Header {- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);padding: 1rem 1.5rem;border-bottom: 1px solid var(--mb-color-border);display: flex;@@ -7,7 +7,7 @@height: 3rem;.HeaderButton {- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);&:not(:disabled):hover {color: var(--mb-color-brand);diff --git a/frontend/src/metabase/query_builder/components/expressions/ExtractColumn/ExtractColumn.module.css b/frontend/src/metabase/query_builder/components/expressions/ExtractColumn/ExtractColumn.module.cssindex bd2c134691e..44facc1f3c7 100644--- a/frontend/src/metabase/query_builder/components/expressions/ExtractColumn/ExtractColumn.module.css+++ b/frontend/src/metabase/query_builder/components/expressions/ExtractColumn/ExtractColumn.module.css@@ -19,7 +19,7 @@.content,.example {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);}}diff --git a/frontend/src/metabase/query_builder/components/expressions/ExtractColumn/ExtractColumn.tsx b/frontend/src/metabase/query_builder/components/expressions/ExtractColumn/ExtractColumn.tsxindex 6da6e154ca7..7cc2b049e23 100644--- a/frontend/src/metabase/query_builder/components/expressions/ExtractColumn/ExtractColumn.tsx+++ b/frontend/src/metabase/query_builder/components/expressions/ExtractColumn/ExtractColumn.tsx@@ -199,10 +199,10 @@ function ExtractColumnButton({onClick={onClick}><Flex align="center" justify="space-between" gap="1rem">- <Text color="text-dark" className={styles.content} fw="bold" p={0}>+ <Text color="text-primary" className={styles.content} fw="bold" p={0}>{title}</Text>- <Text color="text-light" size="sm" className={styles.example}>+ <Text color="text-tertiary" size="sm" className={styles.example}>{example}</Text></Flex>diff --git a/frontend/src/metabase/query_builder/components/expressions/FunctionBrowser/FunctionBrowser.module.css b/frontend/src/metabase/query_builder/components/expressions/FunctionBrowser/FunctionBrowser.module.cssindex 56df4282cf9..bd3f1ba0766 100644--- a/frontend/src/metabase/query_builder/components/expressions/FunctionBrowser/FunctionBrowser.module.css+++ b/frontend/src/metabase/query_builder/components/expressions/FunctionBrowser/FunctionBrowser.module.css@@ -1,5 +1,5 @@.wrapper {- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);border-left: 1px solid var(--mb-color-border);height: 100%;border-top-right-radius: var(--mantine-radius-md);@@ -34,7 +34,7 @@}.structure {- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);border-bottom: 1px solid var(--mb-color-border);font-size: 0.75rem;color: var(--mb-color-text-secondary);diff --git a/frontend/src/metabase/query_builder/components/expressions/FunctionBrowser/FunctionBrowser.tsx b/frontend/src/metabase/query_builder/components/expressions/FunctionBrowser/FunctionBrowser.tsxindex dc4f5c36bcd..e8c44e11864 100644--- a/frontend/src/metabase/query_builder/components/expressions/FunctionBrowser/FunctionBrowser.tsx+++ b/frontend/src/metabase/query_builder/components/expressions/FunctionBrowser/FunctionBrowser.tsx@@ -93,13 +93,7 @@ export function FunctionBrowser({)}{filteredClauses.map((group) => (<>- <Text- size="sm"- p="md"- pb="sm"- c="var(--mb-color-text-medium)"- fw="bold"- >+ <Text size="sm" p="md" pb="sm" c="text-secondary" fw="bold">{group.displayName}</Text>{group.clauses.map((clause) => (@@ -147,7 +141,7 @@ function FunctionBrowserItem({</Text></dt><dd className={S.description}>- <Text size="sm" c="var(--mb-color-text-medium)">+ <Text size="sm" c="text-secondary"><Markdown components={components}>{clause.description}</Markdown></Text></dd>diff --git a/frontend/src/metabase/query_builder/components/expressions/HighlightExpression/HighlightExpression.module.css b/frontend/src/metabase/query_builder/components/expressions/HighlightExpression/HighlightExpression.module.cssindex febf4c88b57..9825b7e560b 100644--- a/frontend/src/metabase/query_builder/components/expressions/HighlightExpression/HighlightExpression.module.css+++ b/frontend/src/metabase/query_builder/components/expressions/HighlightExpression/HighlightExpression.module.css@@ -5,7 +5,7 @@&.block {padding: var(--mantine-spacing-sm);- background-color: var(--mb-color-bg-medium);+ background-color: var(--mb-color-background-tertiary);color: var(--mb-color-text-primary);border-radius: var(--mantine-radius-sm);white-space: pre;diff --git a/frontend/src/metabase/query_builder/components/expressions/Layout/Layout.module.css b/frontend/src/metabase/query_builder/components/expressions/Layout/Layout.module.cssindex b5357020046..8ff0678e932 100644--- a/frontend/src/metabase/query_builder/components/expressions/Layout/Layout.module.css+++ b/frontend/src/metabase/query_builder/components/expressions/Layout/Layout.module.css@@ -21,7 +21,7 @@--main-width: 460px;--sidebar-width: 180px;- background: var(--mb-color-bg-white);+ background: var(--mb-color-background-primary);position: fixed;top: 0;left: 0;diff --git a/frontend/src/metabase/query_builder/components/template_tags/SnippetForm/SnippetForm.module.css b/frontend/src/metabase/query_builder/components/template_tags/SnippetForm/SnippetForm.module.cssindex 1d78689afb5..49316864ecb 100644--- a/frontend/src/metabase/query_builder/components/template_tags/SnippetForm/SnippetForm.module.css+++ b/frontend/src/metabase/query_builder/components/template_tags/SnippetForm/SnippetForm.module.css@@ -1,7 +1,7 @@.SnippetForm {.FormSnippetTextArea {width: 100%;- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);font-family: Monaco, monospace;font-size: 0.875em;font-weight: 400;diff --git a/frontend/src/metabase/query_builder/components/template_tags/SnippetRow/SnippetRow.module.css b/frontend/src/metabase/query_builder/components/template_tags/SnippetRow/SnippetRow.module.cssindex 621ae9b5af2..2d78a97e186 100644--- a/frontend/src/metabase/query_builder/components/template_tags/SnippetRow/SnippetRow.module.css+++ b/frontend/src/metabase/query_builder/components/template_tags/SnippetRow/SnippetRow.module.css@@ -1,10 +1,10 @@.SnippetButton {color: var(--mb-color-brand);- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);margin-top: 0.5rem;&:hover {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);background-color: var(--mb-color-brand);}}diff --git a/frontend/src/metabase/query_builder/components/template_tags/SnippetSidebar/SnippetSidebar.module.css b/frontend/src/metabase/query_builder/components/template_tags/SnippetSidebar/SnippetSidebar.module.cssindex 0f9a09615d6..da1165dde9c 100644--- a/frontend/src/metabase/query_builder/components/template_tags/SnippetSidebar/SnippetSidebar.module.css+++ b/frontend/src/metabase/query_builder/components/template_tags/SnippetSidebar/SnippetSidebar.module.css@@ -1,7 +1,7 @@.SidebarFooter {font-size: 0.875em;cursor: pointer;- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);&:hover {color: var(--mb-color-brand);@@ -9,7 +9,7 @@}.HeaderButton {- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);width: 36px;height: 36px;padding: 0;diff --git a/frontend/src/metabase/query_builder/components/template_tags/TagEditorParamParts/FieldAliasInput.tsx b/frontend/src/metabase/query_builder/components/template_tags/TagEditorParamParts/FieldAliasInput.tsxindex ab17694fba2..03b026e7bc3 100644--- a/frontend/src/metabase/query_builder/components/template_tags/TagEditorParamParts/FieldAliasInput.tsx+++ b/frontend/src/metabase/query_builder/components/template_tags/TagEditorParamParts/FieldAliasInput.tsx@@ -60,19 +60,19 @@ function FieldAlisHelpInfo() {<Box p="md" maw="24rem"><Text>{jt`Required only if the query uses an alias to refer to the mapped field's table. For example, if you map the variable to the ${(- <Code key="field" bg="bg-medium">+ <Code key="field" bg="background-tertiary">{"products.category"}</Code>)} field, but the query aliases the ${(- <Code key="table" bg="bg-medium">+ <Code key="table" bg="background-tertiary">{"products"}</Code>)} table as ${(- <Code key="table-alias" bg="bg-medium">+ <Code key="table-alias" bg="background-tertiary">{"p"}</Code>)}, you'd enter ${(- <Code key="field-alias" bg="bg-medium">+ <Code key="field-alias" bg="background-tertiary">{"p.category"}</Code>)}.`}diff --git a/frontend/src/metabase/query_builder/components/template_tags/TagEditorParamParts/ParameterMultiSelectInput.tsx b/frontend/src/metabase/query_builder/components/template_tags/TagEditorParamParts/ParameterMultiSelectInput.tsxindex 4c3a94d94c5..efdd2e9800a 100644--- a/frontend/src/metabase/query_builder/components/template_tags/TagEditorParamParts/ParameterMultiSelectInput.tsx+++ b/frontend/src/metabase/query_builder/components/template_tags/TagEditorParamParts/ParameterMultiSelectInput.tsx@@ -64,11 +64,11 @@ function ParameterMultiSelectHelpInfo() {<Box p="md" maw="24rem"><Text>{jt`Most of the time you’ll want to use this with an ${(- <Code key="in" bg="bg-medium">+ <Code key="in" bg="background-tertiary">{"IN"}</Code>)} clause, like ${(- <Code key="where" bg="bg-medium">+ <Code key="where" bg="background-tertiary">{"WHERE category IN ({{categories}})"}</Code>)}`}diff --git a/frontend/src/metabase/query_builder/components/template_tags/TagEditorParamParts/TagEditorParam.module.css b/frontend/src/metabase/query_builder/components/template_tags/TagEditorParamParts/TagEditorParam.module.cssindex 42c619a5a4e..5e3f15402a6 100644--- a/frontend/src/metabase/query_builder/components/template_tags/TagEditorParamParts/TagEditorParam.module.css+++ b/frontend/src/metabase/query_builder/components/template_tags/TagEditorParamParts/TagEditorParam.module.css@@ -1,5 +1,5 @@.ContainerLabel {- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);font-weight: 700;/* it's 7px and not aligned with our DS */margin-bottom: 0.5em;@@ -10,10 +10,10 @@}.DefaultParameterValueWidget {- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);padding: 0.75rem;border: 1px solid var(--mb-color-border);border-radius: 4px;- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);font-weight: normal;}diff --git a/frontend/src/metabase/query_builder/components/view/PreviewQueryButton/PreviewQueryButton.module.css b/frontend/src/metabase/query_builder/components/view/PreviewQueryButton/PreviewQueryButton.module.cssindex fd2f7f4e1e0..e4a2d396b2e 100644--- a/frontend/src/metabase/query_builder/components/view/PreviewQueryButton/PreviewQueryButton.module.css+++ b/frontend/src/metabase/query_builder/components/view/PreviewQueryButton/PreviewQueryButton.module.css@@ -1,5 +1,5 @@.PreviewButton {- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);&:hover {color: var(--mb-color-brand);diff --git a/frontend/src/metabase/query_builder/components/view/QuestionDisplayToggle/QuestionDisplayToggle.module.css b/frontend/src/metabase/query_builder/components/view/QuestionDisplayToggle/QuestionDisplayToggle.module.cssindex c304fa3789e..6380046b16c 100644--- a/frontend/src/metabase/query_builder/components/view/QuestionDisplayToggle/QuestionDisplayToggle.module.css+++ b/frontend/src/metabase/query_builder/components/view/QuestionDisplayToggle/QuestionDisplayToggle.module.css@@ -3,12 +3,16 @@align-items: center;padding: 4px 6px;border-radius: 99px;- background-color: var(--mb-color-bg-medium);+ background-color: var(--mb-color-background-tertiary);transition: background 300ms linear;cursor: pointer;&:hover {- background-color: color-mix(in srgb, var(--mb-color-bg-medium), black 5%);+ background-color: color-mix(+ in srgb,+ var(--mb-color-background-tertiary),+ black 5%+ );}&:focus-visible {@@ -31,10 +35,10 @@}.InnerLabel {- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);transition: 300ms;&.activeLabel {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);}}diff --git a/frontend/src/metabase/query_builder/components/view/QuestionRowCount/QuestionRowCount.module.css b/frontend/src/metabase/query_builder/components/view/QuestionRowCount/QuestionRowCount.module.cssindex 59cfaa67d5f..657136cff9f 100644--- a/frontend/src/metabase/query_builder/components/view/QuestionRowCount/QuestionRowCount.module.css+++ b/frontend/src/metabase/query_builder/components/view/QuestionRowCount/QuestionRowCount.module.css@@ -1,7 +1,7 @@.RowCountButton {font-weight: bold;cursor: pointer;- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);&:hover {color: var(--mb-color-brand);@@ -13,5 +13,5 @@}.RowCountStaticLabel {- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);}diff --git a/frontend/src/metabase/query_builder/components/view/View/NotebookContainer/NotebookContainer.tsx b/frontend/src/metabase/query_builder/components/view/View/NotebookContainer/NotebookContainer.tsxindex 692e2ceee83..da11cb4359b 100644--- a/frontend/src/metabase/query_builder/components/view/View/NotebookContainer/NotebookContainer.tsx+++ b/frontend/src/metabase/query_builder/components/view/View/NotebookContainer/NotebookContainer.tsx@@ -119,7 +119,7 @@ export const NotebookContainer = ({<Flexpos="absolute"inset={0}- bg="bg-white"+ bg="background-primary"opacity={isOpen ? 1 : 0}style={{transform: transformStyle,diff --git a/frontend/src/metabase/query_builder/components/view/View/View/View.module.css b/frontend/src/metabase/query_builder/components/view/View/View/View.module.cssindex 431a5540e15..05ebbc24e69 100644--- a/frontend/src/metabase/query_builder/components/view/View/View/View.module.css+++ b/frontend/src/metabase/query_builder/components/view/View/View/View.module.css@@ -1,7 +1,7 @@.QueryBuilderViewRoot {display: flex;flex-direction: column;- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);height: 100%;position: relative;}diff --git a/frontend/src/metabase/query_builder/components/view/View/ViewHeaderContainer/ViewHeaderContainer.module.css b/frontend/src/metabase/query_builder/components/view/View/ViewHeaderContainer/ViewHeaderContainer.module.cssindex 88cfd46463a..acf36ff4a1f 100644--- a/frontend/src/metabase/query_builder/components/view/View/ViewHeaderContainer/ViewHeaderContainer.module.css+++ b/frontend/src/metabase/query_builder/components/view/View/ViewHeaderContainer/ViewHeaderContainer.module.css@@ -7,7 +7,7 @@.QueryBuilderViewHeaderContainer {flex-shrink: 0;- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);position: relative;z-index: 3;}diff --git a/frontend/src/metabase/query_builder/components/view/ViewButton.module.css b/frontend/src/metabase/query_builder/components/view/ViewButton.module.cssindex e8dda232a52..c75bb92e0c2 100644--- a/frontend/src/metabase/query_builder/components/view/ViewButton.module.css+++ b/frontend/src/metabase/query_builder/components/view/ViewButton.module.css@@ -20,7 +20,7 @@&.active {background-color: var(--view-button-color);- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);&:hover {background-color: color-mix(diff --git a/frontend/src/metabase/query_builder/components/view/ViewFooter/LeftViewFooterButtonGroup.module.css b/frontend/src/metabase/query_builder/components/view/ViewFooter/LeftViewFooterButtonGroup.module.cssindex 68d522d5577..e0a0d61b97c 100644--- a/frontend/src/metabase/query_builder/components/view/ViewFooter/LeftViewFooterButtonGroup.module.css+++ b/frontend/src/metabase/query_builder/components/view/ViewFooter/LeftViewFooterButtonGroup.module.css@@ -7,7 +7,7 @@align-items: stretch;.Button {- border: 1px solid var(--mb-color-bg-white);+ border: 1px solid var(--mb-color-background-primary);}}}diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/ViewTitleHeader.module.css b/frontend/src/metabase/query_builder/components/view/ViewHeader/ViewTitleHeader.module.cssindex 3964b19f165..2189cd52f31 100644--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/ViewTitleHeader.module.css+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/ViewTitleHeader.module.css@@ -117,7 +117,7 @@font-size: 1.25rem;line-height: 1.5rem;font-weight: 700;- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);padding-left: 0.5rem;padding-right: 0.25rem;}@@ -136,7 +136,7 @@}&:hover {- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);}}@@ -165,13 +165,13 @@}.ViewRunButtonWithTooltip {- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);&:hover {color: var(--mb-color-brand);&.isDirty {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);}}}@@ -202,7 +202,7 @@&:hover {color: var(--mb-color-brand);- background-color: var(--mb-color-bg-medium);+ background-color: var(--mb-color-background-tertiary);}}}diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/HeaderBreadcrumbs/HeaderBreadcrumbs.module.css b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/HeaderBreadcrumbs/HeaderBreadcrumbs.module.cssindex 4f3f1ef40da..35060d4730f 100644--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/HeaderBreadcrumbs/HeaderBreadcrumbs.module.css+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/HeaderBreadcrumbs/HeaderBreadcrumbs.module.css@@ -9,7 +9,7 @@}.HeaderBreadcrumbs {- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);font-size: 0.8em;font-weight: bold;padding-left: 0.5em;diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/HeaderBreadcrumbs/HeaderBreadcrumbs.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/HeaderBreadcrumbs/HeaderBreadcrumbs.tsxindex c6d977a1807..587b6798ac9 100644--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/HeaderBreadcrumbs/HeaderBreadcrumbs.tsx+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/HeaderBreadcrumbs/HeaderBreadcrumbs.tsx@@ -31,7 +31,7 @@ function getBadgeInactiveColor({variant: "head" | "subhead";isLast: boolean;}) {- return isLast && variant === "head" ? "text-dark" : "text-light";+ return isLast && variant === "head" ? "text-primary" : "text-tertiary";}interface HeadBreadcrumbsProps {diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionActions.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionActions.tsxindex fb700cbf939..2b911418f10 100644--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionActions.tsx+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionActions.tsx@@ -12,7 +12,6 @@ import { QuestionMoreActionsMenu } from "metabase/query_builder/components/view/import type { QueryModalType } from "metabase/query_builder/constants";import { uploadFile } from "metabase/redux/uploads";import { Box, Divider, Icon, Menu } from "metabase/ui";-import { color } from "metabase/ui/utils/colors";import type Question from "metabase-lib/v1/Question";import type { DatasetEditorTab, QueryBuilderMode } from "metabase-types/store";import { UploadMode } from "metabase-types/store/upload";@@ -62,9 +61,7 @@ export const QuestionActions = ({[isShowingQuestionInfoSidebar, isBookmarked],);- const infoButtonColor = isShowingQuestionInfoSidebar- ? color("brand")- : undefined;+ const infoButtonColor = isShowingQuestionInfoSidebar ? "brand" : undefined;const hasCollectionPermissions = question.canWrite();const canAppend =diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/QuestionDataSource.module.css b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/QuestionDataSource.module.cssindex bdb00cfa029..a3fc0acd276 100644--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/QuestionDataSource.module.css+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/QuestionDataSource.module.css@@ -1,5 +1,5 @@.TablesDivider {- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);font-size: 1em;font-weight: bold;padding: 0 0.2em;@@ -7,7 +7,7 @@}.IconWrapper {- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);display: inline-block;font-size: 1rem;margin-left: 0.5rem;diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/SourceModelBreadcrumbs.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/SourceModelBreadcrumbs.tsxindex 0a6582ee129..e426345948f 100644--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/SourceModelBreadcrumbs.tsx+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/SourceModelBreadcrumbs.tsx@@ -38,7 +38,7 @@ export function SourceModelBreadcrumbs({key="collection"to={Urls.collection(collection)}icon={getQuestionIcon(question)}- inactiveColor="text-light"+ inactiveColor="text-tertiary">{collection?.name || t`Our analytics`}</HeadBreadcrumbs.Badge>,@@ -52,8 +52,8 @@ export function SourceModelBreadcrumbs({{/* We use span here for ref forwarding */}<span><HeadBreadcrumbs.Badge- inactiveColor="text-light"- icon={{ name: "warning", color: "var(--mb-color-danger)" }}+ inactiveColor="text-tertiary"+ icon={{ name: "warning", c: "danger" }}to={Urls.question(question.card())}>{question.displayName()}@@ -64,7 +64,7 @@ export function SourceModelBreadcrumbs({<HeadBreadcrumbs.Badgekey="name"to={Urls.question(question.card())}- inactiveColor="text-light"+ inactiveColor="text-tertiary">{question.displayName()}</HeadBreadcrumbs.Badge>diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/SourceTableBreadcrumbs.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/SourceTableBreadcrumbs.tsxindex 18c1036ced7..2c1084d02f9 100644--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/SourceTableBreadcrumbs.tsx+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/SourceTableBreadcrumbs.tsx@@ -63,7 +63,7 @@ export function SourceTableBreadcrumbs({key="collection"to={Urls.collection(collection)}icon="repository"- inactiveColor="text-light"+ inactiveColor="text-tertiary">{collection.name}</HeadBreadcrumbs.Badge>,@@ -74,7 +74,7 @@ export function SourceTableBreadcrumbs({? Urls.queryBuilderTable(table.id, table.db_id): undefined}- inactiveColor={isSubhead ? "text-light" : "text-dark"}+ inactiveColor={isSubhead ? "text-tertiary" : "text-primary"}><span>{table.display_name}diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/utils.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/utils.tsxindex 2c855eae7e4..aff55e75bea 100644--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/utils.tsx+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionDataSource/utils.tsx@@ -148,7 +148,8 @@ function QuestionTableBadges({hasLink,isLast,}: QuestionTableBadgesProps) {- const badgeInactiveColor = isLast && !subHead ? "text-dark" : "text-light";+ const badgeInactiveColor =+ isLast && !subHead ? "text-primary" : "text-tertiary";const parts = tables.map((table) => (<HeadBreadcrumbs.Badgediff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/SavedQuestionLeftSide/SavedQuestionLeftSide.module.css b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/SavedQuestionLeftSide/SavedQuestionLeftSide.module.cssindex ba48e1da8fe..69c1ab24e06 100644--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/SavedQuestionLeftSide/SavedQuestionLeftSide.module.css+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/SavedQuestionLeftSide/SavedQuestionLeftSide.module.css@@ -1,12 +1,12 @@.badge {- background: var(--mb-color-bg-medium);+ background: var(--mb-color-background-tertiary);border-radius: 0.25rem;user-select: none;}.StyledLastEditInfoLabel {/* LastEditInfoLabel uses emotion with higher specificity */- color: var(--mb-color-text-light) !important;+ color: var(--mb-color-text-tertiary) !important;@media screen and (max-width: 40em) {margin-left: 0;diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/DatasetManagementSection/DatasetMetadataStrengthIndicator/DatasetMetadataStrengthIndicator.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/DatasetManagementSection/DatasetMetadataStrengthIndicator/DatasetMetadataStrengthIndicator.tsxindex bdc73cf5f54..21a8612f704 100644--- a/frontend/src/metabase/query_builder/components/view/sidebars/DatasetManagementSection/DatasetMetadataStrengthIndicator/DatasetMetadataStrengthIndicator.tsx+++ b/frontend/src/metabase/query_builder/components/view/sidebars/DatasetManagementSection/DatasetMetadataStrengthIndicator/DatasetMetadataStrengthIndicator.tsx@@ -3,18 +3,19 @@ import { useHoverDirty } from "react-use";import { t } from "ttag";import CS from "metabase/css/core/index.css";+import type { ColorName } from "metabase/lib/colors/types";import { Box, Tooltip } from "metabase/ui";import type Question from "metabase-lib/v1/Question";import { getDatasetMetadataCompletenessPercentage } from "metabase-lib/v1/metadata/utils/models";import DatasetMetadataStrengthIndicatorS from "./DatasetMetadataStrengthIndicator.module.css";-function getIndicationColor(percentage: number, isHovered: boolean): string {+function getIndicationColor(percentage: number, isHovered: boolean): ColorName {if (percentage <= 0.5) {return "danger";}if (!isHovered) {- return "text-medium";+ return "text-secondary";}return percentage >= 0.9 ? "success" : "warning";}diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/ModelCacheManagementSection/ModelCacheManagementSection.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/ModelCacheManagementSection/ModelCacheManagementSection.tsxindex 9b2fa37adcb..12375321d07 100644--- a/frontend/src/metabase/query_builder/components/view/sidebars/ModelCacheManagementSection/ModelCacheManagementSection.tsx+++ b/frontend/src/metabase/query_builder/components/view/sidebars/ModelCacheManagementSection/ModelCacheManagementSection.tsx@@ -79,7 +79,7 @@ export function ModelCacheManagementSection({ model }: Props) {justify="space-between"align="center"data-testid="model-cache-section"- c={canManageDB ? "text-dark" : "text-light"}+ c={canManageDB ? "text-primary" : "text-tertiary"}fz="md"><Box>@@ -93,7 +93,7 @@ export function ModelCacheManagementSection({ model }: Props) {<Buttonvariant="subtle"p="xs"- c="text-dark"+ c="text-primary"size="xs"onClick={() => onRefresh(model.id())}>diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/QuestionDetails.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/QuestionDetails.tsxindex 5cb53d6cae6..14211b81d6d 100644--- a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/QuestionDetails.tsx+++ b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/QuestionDetails.tsx@@ -61,10 +61,10 @@ export const QuestionDetails = ({ question }: { question: Question }) => {)}</SidesheetCardSection><SidesheetCardSection title={t`Saved in`}>- <Flex gap="sm" align="top" color="var(--mb-color-brand)">+ <Flex gap="sm" align="top" c="brand"><Iconname={isDashboardQuestion ? "dashboard" : "folder"}- color="var(--mb-color-brand)"+ c="brand"className={SidebarStyles.IconMargin}/><Text>@@ -109,7 +109,7 @@ function SharingDisplay({ question }: { question: Question }) {<SidesheetCardSection title={t`Visibility`}>{publicUUID && (<Flex gap="sm" align="center">- <Icon name="globe" color="var(--mb-color-brand)" />+ <Icon name="globe" c="brand" /><Text>{t`Shared publicly`}</Text><QuestionPublicLinkPopoverdiff --git a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/QuestionInfoSidebar.module.css b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/QuestionInfoSidebar.module.cssindex 159acd42a1c..58b8ee51786 100644--- a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/QuestionInfoSidebar.module.css+++ b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/QuestionInfoSidebar.module.css@@ -1,6 +1,6 @@.BrandCircle {background-color: var(--mb-color-brand);- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);border-radius: 50%;height: 1rem;width: 1rem;diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/ModelUsageDetails.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/ModelUsageDetails.tsxindex 94641db37cc..5e7abf9c124 100644--- a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/ModelUsageDetails.tsx+++ b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/ModelUsageDetails.tsx@@ -44,7 +44,7 @@ export function ModelUsageDetails({ model }: ModelUsageDetailsProps) {return (<Textlh={1}- color="text-medium"+ color="text-secondary">{t`This model is not used by any questions yet.`}</Text>);}@@ -61,7 +61,7 @@ export function ModelUsageDetails({ model }: ModelUsageDetailsProps) {><Group gap="sm"><Icon- c="text-dark"+ c="text-primary"name={getIcon({ model: "card", ...card }).name as IconName}/><Text lh="1.25rem" color="inherit">diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/QuestionSources.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/QuestionSources.tsxindex 03ebe9bcfe9..f9b11ee2f96 100644--- a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/QuestionSources.tsx+++ b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/QuestionSources.tsx@@ -47,7 +47,7 @@ export const QuestionSources = () => {<Link to={href} variant="brand"><Flex gap="sm" lh="1.25rem" maw="20rem">{iconProps ? (- <Icon mt={2} c="text-dark" {...iconProps} />+ <Icon mt={2} c="text-primary" {...iconProps} />) : null}{name}</Flex>diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/TablesLinkedToQuestion.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/TablesLinkedToQuestion.tsxindex 97fc655ad97..0f688a764ba 100644--- a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/TablesLinkedToQuestion.tsx+++ b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/TablesLinkedToQuestion.tsx@@ -30,7 +30,7 @@ export const TablesLinkedToQuestion = () => {return (<Stack gap="sm">{!filtered.length && (- <Text lh={1} color="text-medium">+ <Text lh={1} color="text-secondary">{question.type() === "model"? t`This model is not linked to any tables.`: t`This question is not linked to any tables.`}@@ -39,7 +39,7 @@ export const TablesLinkedToQuestion = () => {{filtered.map(({ href, name, iconProps }) => (<Link to={href} key={href} variant="brand"><Flex gap="sm" lh="1.25rem">- {iconProps ? <Icon mt={2} c="text-dark" {...iconProps} /> : null}+ {iconProps ? <Icon mt={2} c="text-primary" {...iconProps} /> : null}{name}</Flex></Link>diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/ToggleFullList.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/ToggleFullList.tsxindex 7b797f727aa..4662594e8e1 100644--- a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/ToggleFullList.tsx+++ b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/components/ToggleFullList.tsx@@ -22,7 +22,7 @@ export const ToggleFullList = ({return (<Group gap="sm" mt="sm" lh={1}>{- <Text c="text-light" lh={1}>+ <Text c="text-tertiary" lh={1}>{isExpanded? c("{0} is a number").t`Showing all ${fullLength} questions`: c("The variables are numbers")diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/AddAggregationButton/AddAggregationButton.module.css b/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/AddAggregationButton/AddAggregationButton.module.cssindex e2c5c81dd80..d82a7fb79f8 100644--- a/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/AddAggregationButton/AddAggregationButton.module.css+++ b/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/AddAggregationButton/AddAggregationButton.module.css@@ -1,10 +1,10 @@.AddAggregationButtonRoot {padding: 0.625rem;color: var(--mb-color-summarize);- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);&:hover {color: var(--mb-color-summarize);- background-color: var(--mb-color-bg-medium);+ background-color: var(--mb-color-background-tertiary);}}diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/AggregationItem/AggregationItem.module.css b/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/AggregationItem/AggregationItem.module.cssindex 4c26b20a0a0..29326d3541f 100644--- a/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/AggregationItem/AggregationItem.module.css+++ b/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/AggregationItem/AggregationItem.module.css@@ -4,7 +4,7 @@padding: 0.5rem;font-weight: bold;border-radius: 6px;- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);background-color: var(--mb-color-summarize);transition:background 300ms linear,diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/BreakoutColumnList/BreakoutColumnListItem/BreakoutColumnListItem.module.css b/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/BreakoutColumnList/BreakoutColumnListItem/BreakoutColumnListItem.module.cssindex e7fcc2963c2..6e7a7ca4475 100644--- a/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/BreakoutColumnList/BreakoutColumnListItem/BreakoutColumnListItem.module.css+++ b/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/BreakoutColumnList/BreakoutColumnListItem/BreakoutColumnListItem.module.css@@ -12,17 +12,17 @@.AddButton {width: 34px;margin-left: 0.5rem;- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);}.RemoveButton {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);background-color: transparent;opacity: 0.6;transition: all 100ms;&:hover {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);background-color: transparent;opacity: 1;}@@ -56,16 +56,20 @@.Content,.ColumnTypeIcon {background-color: var(--mb-color-summarize);- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);}.BucketTriggerButton {visibility: visible;opacity: 1;- color: color-mix(in srgb, var(--mb-color-text-white), transparent 35%);+ color: color-mix(+ in srgb,+ var(--mb-color-text-primary-inverse),+ transparent 35%+ );&:hover {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);opacity: 1;}}@@ -73,7 +77,7 @@&.isNotSelected {.ColumnTypeIcon {- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);}&:hover {@@ -81,20 +85,20 @@.Content,.ColumnTypeIcon {color: var(--mb-color-summarize);- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);}.AddButton:hover {- background-color: var(--mb-color-bg-medium);+ background-color: var(--mb-color-background-tertiary);}.BucketTriggerButton {visibility: visible;opacity: 1;- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);&:hover {- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);}}}@@ -102,5 +106,5 @@}.ColumnTypeIcon {- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);}diff --git a/frontend/src/metabase/querying/editor/components/QueryEditor/NativeQueryPreviewSidebar/NativeQueryPreviewSidebar.tsx b/frontend/src/metabase/querying/editor/components/QueryEditor/NativeQueryPreviewSidebar/NativeQueryPreviewSidebar.tsxindex d67320cbd1c..a8b14389fb7 100644--- a/frontend/src/metabase/querying/editor/components/QueryEditor/NativeQueryPreviewSidebar/NativeQueryPreviewSidebar.tsx+++ b/frontend/src/metabase/querying/editor/components/QueryEditor/NativeQueryPreviewSidebar/NativeQueryPreviewSidebar.tsx@@ -66,11 +66,11 @@ export function NativeQueryPreviewSidebarToggle({onClick={onToggleNativeQueryPreviewSidebar}size="lg"className={S.nativeSidebarToggle}- color="text"+ c="text-primary"variant="subtle"aria-label={label}>- <Icon name="sql" color="text" />+ <Icon name="sql" c="text-primary" /></ActionIcon></Tooltip>);diff --git a/frontend/src/metabase/querying/filters/components/BooleanPicker/BooleanPicker.tsx b/frontend/src/metabase/querying/filters/components/BooleanPicker/BooleanPicker.tsxindex d6d13209792..d00fab7a077 100644--- a/frontend/src/metabase/querying/filters/components/BooleanPicker/BooleanPicker.tsx+++ b/frontend/src/metabase/querying/filters/components/BooleanPicker/BooleanPicker.tsx@@ -50,7 +50,7 @@ export function BooleanPicker({</Radio.Group>{hasExpandButton && (<Button- c="text-medium"+ c="text-secondary"variant="subtle"aria-label={t`More options`}rightSection={<Icon name="chevrondown" />}diff --git a/frontend/src/metabase/querying/filters/components/DatePicker/ExcludeDatePicker/ExcludeDatePicker.tsx b/frontend/src/metabase/querying/filters/components/DatePicker/ExcludeDatePicker/ExcludeDatePicker.tsxindex 919d650cef1..6c16923f7db 100644--- a/frontend/src/metabase/querying/filters/components/DatePicker/ExcludeDatePicker/ExcludeDatePicker.tsx+++ b/frontend/src/metabase/querying/filters/components/DatePicker/ExcludeDatePicker/ExcludeDatePicker.tsx@@ -130,7 +130,7 @@ export function ExcludeOptionPicker({{unitOptions.map((option, index) => (<Buttonkey={index}- c="var(--mb-color-text-primary)"+ c="text-primary"display="block"variant="subtle"onClick={() => onSelectUnit(option.unit)}@@ -146,8 +146,8 @@ export function ExcludeOptionPicker({key={index}c={option.operator === value?.operator- ? "var(--mb-color-text-brand)"- : "var(--mb-color-text-primary)"+ ? "text-brand"+ : "text-primary"}display="block"variant="subtle"diff --git a/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/DateIntervalPicker/DateIntervalPicker.tsx b/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/DateIntervalPicker/DateIntervalPicker.tsxindex a5f5471bdf0..ba37afee5d5 100644--- a/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/DateIntervalPicker/DateIntervalPicker.tsx+++ b/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/DateIntervalPicker/DateIntervalPicker.tsx@@ -94,7 +94,7 @@ export function DateIntervalPicker({<Tooltip label={t`Starting from…`} position="bottom"><Buttonaria-label={t`Starting from…`}- c="var(--mb-color-text-secondary)"+ c="text-secondary"variant="subtle"leftSection={<Icon name="arrow_left_to_line" />}onClick={handleStartingFromClick}@@ -106,7 +106,7 @@ export function DateIntervalPicker({</Flex><Divider /><Group px="md" py="sm" justify="space-between">- <Group c="var(--mb-color-text-secondary)" gap="sm">+ <Group c="text-secondary" gap="sm"><Icon name="calendar" /><Text c="inherit">{dateRangeText}</Text></Group>diff --git a/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/DateOffsetIntervalPicker/DateOffsetIntervalPicker.tsx b/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/DateOffsetIntervalPicker/DateOffsetIntervalPicker.tsxindex 425cecc4e49..a423ef42a60 100644--- a/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/DateOffsetIntervalPicker/DateOffsetIntervalPicker.tsx+++ b/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/DateOffsetIntervalPicker/DateOffsetIntervalPicker.tsx@@ -130,7 +130,7 @@ export function DateOffsetIntervalPicker({}}/><Button- c="text-medium"+ c="text-secondary"variant="subtle"leftSection={<Icon name="close" />}aria-label={t`Remove offset`}@@ -139,7 +139,7 @@ export function DateOffsetIntervalPicker({</Box><Divider /><Group px="md" py="sm" gap="sm" justify="space-between">- <Group c="text-medium" gap="sm">+ <Group c="text-secondary" gap="sm"><Icon name="calendar" /><Text c="inherit">{dateRangeText}</Text></Group>diff --git a/frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/DateRangePicker/DateRangePickerBody/DateRangePickerBody.tsx b/frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/DateRangePicker/DateRangePickerBody/DateRangePickerBody.tsxindex 521a8c01e61..4721aa2b123 100644--- a/frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/DateRangePicker/DateRangePickerBody/DateRangePickerBody.tsx+++ b/frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/DateRangePicker/DateRangePickerBody/DateRangePickerBody.tsx@@ -92,7 +92,7 @@ export function DateRangePickerBody({aria-label={t`Start date`}onChange={(val) => val && handleStartDateChange(dayjs(val).toDate())}/>- <Text c="text-light">{t`and`}</Text>+ <Text c="text-tertiary">{t`and`}</Text><DateInputclassName={S.FlexDateInput}value={endDate}@@ -110,7 +110,7 @@ export function DateRangePickerBody({aria-label={t`Start time`}onChange={handleStartTimeChange}/>- <Text c="text-light">{t`and`}</Text>+ <Text c="text-tertiary">{t`and`}</Text><TimeInputclassName={S.FlexTimeInput}value={endDate}diff --git a/frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/TimeToggle/TimeToggle.tsx b/frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/TimeToggle/TimeToggle.tsxindex b18143fe07e..fcb56a9ddbe 100644--- a/frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/TimeToggle/TimeToggle.tsx+++ b/frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/TimeToggle/TimeToggle.tsx@@ -13,7 +13,7 @@ export function TimeToggle({ hasTime, ...props }: TimeToggleProps) {return (<Button- c="var(--mb-color-text-secondary)"+ c="text-secondary"variant="subtle"leftSection={<Icon name="clock" />}aria-label={label}diff --git a/frontend/src/metabase/querying/filters/components/FilterValuePicker/ListValuePicker/ListValuePicker.tsx b/frontend/src/metabase/querying/filters/components/FilterValuePicker/ListValuePicker/ListValuePicker.tsxindex 51e49630935..e4e9a701ef9 100644--- a/frontend/src/metabase/querying/filters/components/FilterValuePicker/ListValuePicker/ListValuePicker.tsx+++ b/frontend/src/metabase/querying/filters/components/FilterValuePicker/ListValuePicker/ListValuePicker.tsx@@ -63,7 +63,7 @@ function CheckboxListPicker({value={searchValue}placeholder={placeholder}autoFocus={autoFocus}- leftSection={<Icon name="search" c="text-light" />}+ leftSection={<Icon name="search" c="text-tertiary" />}onChange={handleInputChange}/>{filteredOptions.length > 0 ? (@@ -92,9 +92,9 @@ function CheckboxListPicker({</Checkbox.Group></Stack>) : (- <Stack c="text-light" justify="center" align="center">+ <Stack c="text-tertiary" justify="center" align="center"><Icon name="search" size={40} />- <Text c="text-medium" fw="bold">{t`Didn't find anything`}</Text>+ <Text c="text-secondary" fw="bold">{t`Didn't find anything`}</Text></Stack>)}</Stack>diff --git a/frontend/src/metabase/querying/metrics/components/MetricEditor/MetricEditor.tsx b/frontend/src/metabase/querying/metrics/components/MetricEditor/MetricEditor.tsxindex c4166601580..fec580638a5 100644--- a/frontend/src/metabase/querying/metrics/components/MetricEditor/MetricEditor.tsx+++ b/frontend/src/metabase/querying/metrics/components/MetricEditor/MetricEditor.tsx@@ -89,7 +89,7 @@ export const MetricEditor = forwardRef<HTMLDivElement, MetricEditorProps>(};return (- <Flex h="100%" direction="column" bg="bg-white" ref={ref}>+ <Flex h="100%" direction="column" bg="background-primary" ref={ref}><MetricEditorHeaderquestion={question}isDirty={isDirty}diff --git a/frontend/src/metabase/querying/metrics/components/MetricEditor/MetricEditorFooter/MetricEmptyState/MetricEmptyState.tsx b/frontend/src/metabase/querying/metrics/components/MetricEditor/MetricEditorFooter/MetricEmptyState/MetricEmptyState.tsxindex 3997b5bf647..390fbf53a30 100644--- a/frontend/src/metabase/querying/metrics/components/MetricEditor/MetricEditorFooter/MetricEmptyState/MetricEmptyState.tsx+++ b/frontend/src/metabase/querying/metrics/components/MetricEditor/MetricEditorFooter/MetricEmptyState/MetricEmptyState.tsx@@ -22,7 +22,7 @@ export function MetricEmptyState({<Text mb="sm" fw="bold" fz="lg">{t`Create Metrics to define the official way to calculate important numbers for your team`}</Text>- <Text mb="lg" c="text-medium" maw="30rem" ta="center">+ <Text mb="lg" c="text-secondary" maw="30rem" ta="center">{t`Metrics are like pre-defined calculations: create your aggregations once, save them as metrics, and use them whenever you need to analyze your data.`}</Text>{isRunnable && (diff --git a/frontend/src/metabase/querying/notebook/components/DataStep/DataStep.module.css b/frontend/src/metabase/querying/notebook/components/DataStep/DataStep.module.cssindex 8d1a3c75d37..a818aeae742 100644--- a/frontend/src/metabase/querying/notebook/components/DataStep/DataStep.module.css+++ b/frontend/src/metabase/querying/notebook/components/DataStep/DataStep.module.css@@ -1,5 +1,5 @@.DataStepIconButton {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);padding: var(--notebook-cell-container-padding);opacity: 0.5;height: 100%;diff --git a/frontend/src/metabase/querying/notebook/components/ExpressionStep/ExpressionStep.unit.spec.tsx b/frontend/src/metabase/querying/notebook/components/ExpressionStep/ExpressionStep.unit.spec.tsxindex a3682783fe6..4d71d6e0797 100644--- a/frontend/src/metabase/querying/notebook/components/ExpressionStep/ExpressionStep.unit.spec.tsx+++ b/frontend/src/metabase/querying/notebook/components/ExpressionStep/ExpressionStep.unit.spec.tsx@@ -29,6 +29,7 @@ function setup({ query = createQuery() }: SetupOpts = {}) {renderWithProviders(<ExpressionStepstep={step}+ // @ts-expect-error unit testcolor="#93A1AB"stageIndex={step.stageIndex}query={step.query}diff --git a/frontend/src/metabase/querying/notebook/components/FieldPicker/FieldPicker.module.css b/frontend/src/metabase/querying/notebook/components/FieldPicker/FieldPicker.module.cssindex f6799c4a874..79ee9dc8506 100644--- a/frontend/src/metabase/querying/notebook/components/FieldPicker/FieldPicker.module.css+++ b/frontend/src/metabase/querying/notebook/components/FieldPicker/FieldPicker.module.css@@ -6,7 +6,7 @@.ItemIcon {margin: 0 0.5em;margin-left: 0.75em;- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);}.ItemList {@@ -23,7 +23,7 @@min-height: 2.25rem;&:hover {- background: var(--mb-color-bg-medium);+ background: var(--mb-color-background-tertiary);}}diff --git a/frontend/src/metabase/querying/notebook/components/JoinStep/Join/Join.tsx b/frontend/src/metabase/querying/notebook/components/JoinStep/Join/Join.tsxindex 5396c955bf3..702d81bcddb 100644--- a/frontend/src/metabase/querying/notebook/components/JoinStep/Join/Join.tsx+++ b/frontend/src/metabase/querying/notebook/components/JoinStep/Join/Join.tsx@@ -1,5 +1,6 @@import { useMemo, useState } from "react";+import type { ColorName } from "metabase/lib/colors/types";import * as Lib from "metabase-lib";import { JoinComplete } from "../JoinComplete";@@ -10,7 +11,7 @@ interface JoinProps {stageIndex: number;join: Lib.Join;joinPosition: number;- color: string;+ color: ColorName;isReadOnly: boolean;onJoinChange: (newJoin: Lib.Join) => void;onQueryChange: (newQuery: Lib.Query) => void;diff --git a/frontend/src/metabase/querying/notebook/components/JoinStep/JoinComplete/JoinComplete.tsx b/frontend/src/metabase/querying/notebook/components/JoinStep/JoinComplete/JoinComplete.tsxindex fc721d7cc6d..da9ed13647f 100644--- a/frontend/src/metabase/querying/notebook/components/JoinStep/JoinComplete/JoinComplete.tsx+++ b/frontend/src/metabase/querying/notebook/components/JoinStep/JoinComplete/JoinComplete.tsx@@ -1,6 +1,7 @@import { useMemo, useState } from "react";import { t } from "ttag";+import type { ColorName } from "metabase/lib/colors/types";import { Flex, Text, rem } from "metabase/ui";import * as Lib from "metabase-lib";@@ -22,7 +23,7 @@ interface JoinCompleteProps {stageIndex: number;join: Lib.Join;joinPosition: number;- color: string;+ color: ColorName;isReadOnly: boolean;onJoinChange: (newJoin: Lib.Join) => void;onQueryChange: (newQuery: Lib.Query) => void;@@ -160,7 +161,7 @@ export function JoinComplete({}onRemove={() => handleRemoveCondition(index)}/>- {!isLast && <Text color="text-dark">{t`and`}</Text>}+ {!isLast && <Text color="text-primary">{t`and`}</Text>}{isLast && !isReadOnly && !isAddingNewCondition && (<NotebookCellAddcolor={color}diff --git a/frontend/src/metabase/querying/notebook/components/JoinStep/JoinConditionColumnPicker/JoinColumnButton/JoinColumnButton.tsx b/frontend/src/metabase/querying/notebook/components/JoinStep/JoinConditionColumnPicker/JoinColumnButton/JoinColumnButton.tsxindex 5ccf8967a00..181b91079ec 100644--- a/frontend/src/metabase/querying/notebook/components/JoinStep/JoinConditionColumnPicker/JoinColumnButton/JoinColumnButton.tsx+++ b/frontend/src/metabase/querying/notebook/components/JoinStep/JoinConditionColumnPicker/JoinColumnButton/JoinColumnButton.tsx@@ -60,7 +60,7 @@ export const JoinColumnButton = forwardRef(function JoinColumnTarget(display="block"fz={11}lh={1}- c={isEmpty ? "brand" : "text-white"}+ c={isEmpty ? "brand" : "text-primary-inverse"}ta="left"fw={400}>@@ -70,7 +70,7 @@ export const JoinColumnButton = forwardRef(function JoinColumnTarget(<TextclassName={S.joinCellContent}display="block"- c={isEmpty ? "brand" : "text-white"}+ c={isEmpty ? "brand" : "text-primary-inverse"}ta="left"fw={700}lh={1}diff --git a/frontend/src/metabase/querying/notebook/components/JoinStep/JoinConditionOperatorPicker/JoinConditionOperatorPicker.module.css b/frontend/src/metabase/querying/notebook/components/JoinStep/JoinConditionOperatorPicker/JoinConditionOperatorPicker.module.cssindex 40ad9694539..49e117133e0 100644--- a/frontend/src/metabase/querying/notebook/components/JoinStep/JoinConditionOperatorPicker/JoinConditionOperatorPicker.module.css+++ b/frontend/src/metabase/querying/notebook/components/JoinStep/JoinConditionOperatorPicker/JoinConditionOperatorPicker.module.css@@ -22,7 +22,7 @@}&.completeCondition {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);background-color: transparent;&.isOpened {diff --git a/frontend/src/metabase/querying/notebook/components/JoinStep/JoinConditionRemoveButton/JoinConditionRemoveButton.module.css b/frontend/src/metabase/querying/notebook/components/JoinStep/JoinConditionRemoveButton/JoinConditionRemoveButton.module.cssindex 1ef73516f0d..f221b9f66d4 100644--- a/frontend/src/metabase/querying/notebook/components/JoinStep/JoinConditionRemoveButton/JoinConditionRemoveButton.module.css+++ b/frontend/src/metabase/querying/notebook/components/JoinStep/JoinConditionRemoveButton/JoinConditionRemoveButton.module.css@@ -6,11 +6,11 @@cursor: pointer;border-radius: 0 8px 8px 0;border-left: 1px solid- color-mix(in srgb, var(var(--mb-color-bg-white)), transparent 25%);+ color-mix(in srgb, var(var(--mb-color-background-primary)), transparent 25%);color: var(--mb-color-text-brand);&.isConditionComplete {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);&:hover,&:focus {diff --git a/frontend/src/metabase/querying/notebook/components/JoinStep/JoinDraft/JoinDraft.tsx b/frontend/src/metabase/querying/notebook/components/JoinStep/JoinDraft/JoinDraft.tsxindex 2811e843c9a..d3be95eb2bc 100644--- a/frontend/src/metabase/querying/notebook/components/JoinStep/JoinDraft/JoinDraft.tsx+++ b/frontend/src/metabase/querying/notebook/components/JoinStep/JoinDraft/JoinDraft.tsx@@ -2,6 +2,7 @@ import { useLayoutEffect, useMemo, useState } from "react";import { useLatest } from "react-use";import { t } from "ttag";+import type { ColorName } from "metabase/lib/colors/types";import { Flex, Text, rem } from "metabase/ui";import * as Lib from "metabase-lib";@@ -17,7 +18,7 @@ import { getDefaultJoinStrategy, getJoinFields } from "./utils";interface JoinDraftProps {query: Lib.Query;stageIndex: number;- color: string;+ color: ColorName;initialStrategy?: Lib.JoinStrategy;initialRhsTable?: Lib.Joinable;isReadOnly: boolean;diff --git a/frontend/src/metabase/querying/notebook/components/JoinStep/JoinTablePicker/JoinTablePicker.module.css b/frontend/src/metabase/querying/notebook/components/JoinStep/JoinTablePicker/JoinTablePicker.module.cssindex 4266822aba9..54e71e357ff 100644--- a/frontend/src/metabase/querying/notebook/components/JoinStep/JoinTablePicker/JoinTablePicker.module.css+++ b/frontend/src/metabase/querying/notebook/components/JoinStep/JoinTablePicker/JoinTablePicker.module.css@@ -1,6 +1,6 @@.ColumnPickerButton {padding: var(--notebook-cell-container-padding);opacity: 0.5;- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);height: 100%;}diff --git a/frontend/src/metabase/querying/notebook/components/JoinStep/JoinTablePicker/JoinTablePicker.tsx b/frontend/src/metabase/querying/notebook/components/JoinStep/JoinTablePicker/JoinTablePicker.tsxindex 17512fcb344..517d62af3fd 100644--- a/frontend/src/metabase/querying/notebook/components/JoinStep/JoinTablePicker/JoinTablePicker.tsx+++ b/frontend/src/metabase/querying/notebook/components/JoinStep/JoinTablePicker/JoinTablePicker.tsx@@ -4,6 +4,7 @@ import { t } from "ttag";import IconButtonWrapper from "metabase/common/components/IconButtonWrapper";import { METAKEY } from "metabase/lib/browser";+import type { ColorName } from "metabase/lib/colors/types";import { useSelector } from "metabase/lib/redux";import { getIsEmbedding } from "metabase/selectors/embed";import { Box, Icon, Popover, Tooltip } from "metabase/ui";@@ -20,7 +21,7 @@ interface JoinTablePickerProps {query: Lib.Query;stageIndex: number;table: Lib.Joinable | undefined;- color: string;+ color: ColorName;isReadOnly: boolean;columnPicker: ReactNode;onChange: (table: Lib.Joinable) => void;diff --git a/frontend/src/metabase/querying/notebook/components/NativeQueryPreview/NativeQueryPreview.module.css b/frontend/src/metabase/querying/notebook/components/NativeQueryPreview/NativeQueryPreview.module.cssindex 5282f1c9861..931b74c426b 100644--- a/frontend/src/metabase/querying/notebook/components/NativeQueryPreview/NativeQueryPreview.module.css+++ b/frontend/src/metabase/querying/notebook/components/NativeQueryPreview/NativeQueryPreview.module.css@@ -11,7 +11,7 @@}.code {- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);border-radius: var(--mantine-radius-md);overflow: hidden;border: 1px solid var(--mb-color-border);diff --git a/frontend/src/metabase/querying/notebook/components/NotebookCell/NotebookCell.module.css b/frontend/src/metabase/querying/notebook/components/NotebookCell/NotebookCell.module.cssindex fc441452c0e..24799924507 100644--- a/frontend/src/metabase/querying/notebook/components/NotebookCell/NotebookCell.module.css+++ b/frontend/src/metabase/querying/notebook/components/NotebookCell/NotebookCell.module.css@@ -16,7 +16,7 @@border-radius: 6px;border: 2px solid transparent;cursor: default;- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);align-items: stretch;transition: border 300ms linear;@@ -66,7 +66,7 @@&.leftBorder {border-left: 1px solid- color-mix(in srgb, var(--mb-color-bg-white), transparent 25%);+ color-mix(in srgb, var(--mb-color-background-primary), transparent 25%);}&.leftRoundedCorners {diff --git a/frontend/src/metabase/querying/notebook/components/NotebookCell/NotebookCell.tsx b/frontend/src/metabase/querying/notebook/components/NotebookCell/NotebookCell.tsxindex 1fb8b073e9a..1997726e98f 100644--- a/frontend/src/metabase/querying/notebook/components/NotebookCell/NotebookCell.tsx+++ b/frontend/src/metabase/querying/notebook/components/NotebookCell/NotebookCell.tsx@@ -12,11 +12,10 @@ const _NotebookCell = ({ className, color, ...props }: FlexProps) => {<FlexclassName={cx(S.NotebookCell, className)}p={props.p ?? rem("14px")}- c={color}{...props}style={{- "--notebook-cell-color": color,+ "--notebook-cell-color": `var(--mb-color-${color})`,} as CSSProperties}/>@@ -81,7 +80,7 @@ export const NotebookCellItem = forwardRef<)}style={{- "--notebook-cell-item-container-color": color,+ "--notebook-cell-item-container-color": `var(--mb-color-${color})`,} as CSSProperties}{...restProps}@@ -102,7 +101,7 @@ export const NotebookCellItem = forwardRef<{padding: CONTAINER_PADDING,...containerStyle,- "--notebook-cell-item-content-container-color": color,+ "--notebook-cell-item-content-container-color": `var(--mb-color-${color})`,} as CSSProperties}>@@ -123,7 +122,7 @@ export const NotebookCellItem = forwardRef<{padding: CONTAINER_PADDING,...rightContainerStyle,- "--notebook-cell-item-content-container-color": color,+ "--notebook-cell-item-content-container-color": `var(--mb-color-${color})`,} as CSSProperties}>diff --git a/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/NotebookDataPicker.tsx b/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/NotebookDataPicker.tsxindex 30cbeaa61b7..172f6767620 100644--- a/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/NotebookDataPicker.tsx+++ b/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/NotebookDataPicker.tsx@@ -104,7 +104,7 @@ export function NotebookDataPicker({const canSelectTableColumns = table && isRaw && !isDisabled;return (<NotebookCellItem- color="var(--mb-color-brand)"+ color="brand"inactive={!table}right={canSelectTableColumns && columnPicker}containerStyle={{ padding: 0 }}diff --git a/frontend/src/metabase/querying/notebook/components/NotebookNativePreview/NotebookNativePreview.tsx b/frontend/src/metabase/querying/notebook/components/NotebookNativePreview/NotebookNativePreview.tsxindex d6c454a086f..c9653ccadd8 100644--- a/frontend/src/metabase/querying/notebook/components/NotebookNativePreview/NotebookNativePreview.tsx+++ b/frontend/src/metabase/querying/notebook/components/NotebookNativePreview/NotebookNativePreview.tsx@@ -76,13 +76,13 @@ export const NotebookNativePreview = ({data-testid="native-query-preview-sidebar"w="100%"h="100%"- bg="bg-white"+ bg="background-primary"display="flex"style={{ flexDirection: "column" }}><Boxcomponent="header"- c="text-dark"+ c="text-primary"fz={rem(20)}lh={rem(24)}fw="bold"diff --git a/frontend/src/metabase/querying/notebook/components/NotebookStep/NotebookActionButton/NotebookActionButton.tsx b/frontend/src/metabase/querying/notebook/components/NotebookStep/NotebookActionButton/NotebookActionButton.tsxindex f02a143f10a..fdda635a1c3 100644--- a/frontend/src/metabase/querying/notebook/components/NotebookStep/NotebookActionButton/NotebookActionButton.tsx+++ b/frontend/src/metabase/querying/notebook/components/NotebookStep/NotebookActionButton/NotebookActionButton.tsx@@ -2,6 +2,7 @@ import cx from "classnames";import type { CSSProperties } from "react";import Button from "metabase/common/components/Button";+import type { ColorName } from "metabase/lib/colors/types";import type { IconName } from "metabase/ui";import { Tooltip } from "metabase/ui";@@ -11,7 +12,7 @@ interface NotebookActionButtonProps {className?: string;icon?: IconName;title: string;- color: string;+ color: ColorName;secondary?: boolean;large?: boolean;onClick: () => void;@@ -46,7 +47,7 @@ export function NotebookActionButton({onClick={onClick}style={{- "--notebook-action-button-color": color,+ "--notebook-action-button-color": `var(--mb-color-${color})`,} as CSSProperties}{...props}diff --git a/frontend/src/metabase/querying/notebook/components/NotebookStep/NotebookStep.tsx b/frontend/src/metabase/querying/notebook/components/NotebookStep/NotebookStep.tsxindex bd3fdeece72..3d7fea698c3 100644--- a/frontend/src/metabase/querying/notebook/components/NotebookStep/NotebookStep.tsx+++ b/frontend/src/metabase/querying/notebook/components/NotebookStep/NotebookStep.tsx@@ -6,7 +6,6 @@ import ExpandingContent from "metabase/common/components/ExpandingContent";import { useToggle } from "metabase/common/hooks/use-toggle";import CS from "metabase/css/core/index.css";import { Box, Flex } from "metabase/ui";-import { color as c } from "metabase/ui/utils/colors";import type * as Lib from "metabase-lib";import type {@@ -138,7 +137,7 @@ export function NotebookStep({component={NotebookActionButton}icon="play"title={t`Preview`}- color={c("text-light")}+ color={"text-tertiary"}onClick={openPreview}data-testid="step-preview-button"/>diff --git a/frontend/src/metabase/querying/notebook/components/NotebookStep/utils.ts b/frontend/src/metabase/querying/notebook/components/NotebookStep/utils.tsindex 086230ade7f..0b06ade5c2f 100644--- a/frontend/src/metabase/querying/notebook/components/NotebookStep/utils.ts+++ b/frontend/src/metabase/querying/notebook/components/NotebookStep/utils.ts@@ -1,8 +1,8 @@import type { ComponentType } from "react";import { t } from "ttag";+import type { ColorName } from "metabase/lib/colors/types";import type { IconName } from "metabase/ui";-import { color } from "metabase/ui/utils/colors";import type {NotebookStepHeaderProps,@@ -28,7 +28,7 @@ type StepUIItem = {priority?: number;secondary?: boolean;compact?: boolean;- color: () => string;+ color: () => ColorName;Step: ComponentType<NotebookStepProps>;StepHeader: ComponentType<NotebookStepHeaderProps>;};@@ -38,7 +38,7 @@ const STEPS: Record<NotebookStepType, StepUIItem> = {get title() {return t`Data`;},- color: () => color("brand"),+ color: () => "brand",Step: DataStep,StepHeader: NotebookStepHeader,},@@ -49,7 +49,7 @@ const STEPS: Record<NotebookStepType, StepUIItem> = {icon: "join_left_outer",priority: 1,compact: true,- color: () => color("brand"),+ color: () => "brand",Step: JoinStep,StepHeader: NotebookStepHeader,},@@ -60,7 +60,7 @@ const STEPS: Record<NotebookStepType, StepUIItem> = {icon: "add_data",compact: true,secondary: true,- color: () => color("text-light"),+ color: () => "text-tertiary",Step: ExpressionStep,StepHeader: NotebookStepHeader,},@@ -70,7 +70,7 @@ const STEPS: Record<NotebookStepType, StepUIItem> = {},icon: "filter",priority: 10,- color: () => color("filter"),+ color: () => "filter",Step: FilterStep,StepHeader: NotebookStepHeader,},@@ -80,7 +80,7 @@ const STEPS: Record<NotebookStepType, StepUIItem> = {},icon: "sum",priority: 5,- color: () => color("summarize"),+ color: () => "summarize",Step: SummarizeStep,StepHeader: SummarizeStepHeader,},@@ -90,7 +90,7 @@ const STEPS: Record<NotebookStepType, StepUIItem> = {},icon: "sum",priority: 5,- color: () => color("summarize"),+ color: () => "summarize",Step: AggregateStep,StepHeader: NotebookStepHeader,},@@ -100,7 +100,7 @@ const STEPS: Record<NotebookStepType, StepUIItem> = {},icon: "segment",priority: 1,- color: () => color("accent4"),+ color: () => "accent4",Step: BreakoutStep,StepHeader: NotebookStepHeader,},@@ -111,7 +111,7 @@ const STEPS: Record<NotebookStepType, StepUIItem> = {icon: "sort",compact: true,secondary: true,- color: () => color("text-light"),+ color: () => "text-tertiary",Step: SortStep,StepHeader: NotebookStepHeader,},@@ -122,7 +122,7 @@ const STEPS: Record<NotebookStepType, StepUIItem> = {icon: "list",compact: true,secondary: true,- color: () => color("text-light"),+ color: () => "text-tertiary",Step: LimitStep,StepHeader: NotebookStepHeader,},diff --git a/frontend/src/metabase/querying/notebook/components/SortStep/SortStep.module.css b/frontend/src/metabase/querying/notebook/components/SortStep/SortStep.module.cssindex 0ae2d3d5669..57dca08ceab 100644--- a/frontend/src/metabase/querying/notebook/components/SortStep/SortStep.module.css+++ b/frontend/src/metabase/querying/notebook/components/SortStep/SortStep.module.css@@ -2,7 +2,7 @@display: flex;align-items: center;gap: 0.5rem;- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);font-weight: 700;&:not(:disabled) {diff --git a/frontend/src/metabase/querying/notebook/components/SortStep/SortStep.tsx b/frontend/src/metabase/querying/notebook/components/SortStep/SortStep.tsxindex b7f477e3d2f..ba4a5ef6176 100644--- a/frontend/src/metabase/querying/notebook/components/SortStep/SortStep.tsx+++ b/frontend/src/metabase/querying/notebook/components/SortStep/SortStep.tsx@@ -133,7 +133,7 @@ const SortPopover = ({query={query}stageIndex={stageIndex}columnGroups={columnGroups}- color="text-dark"+ color="text-primary"checkIsColumnSelected={(item) => checkColumnSelected(item, orderByIndex)}onSelect={(column: Lib.ColumnMetadata) => {const isUpdate = orderBy != null;diff --git a/frontend/src/metabase/querying/notebook/types.ts b/frontend/src/metabase/querying/notebook/types.tsindex f6849ce30e7..ef242a29d4e 100644--- a/frontend/src/metabase/querying/notebook/types.ts+++ b/frontend/src/metabase/querying/notebook/types.ts@@ -1,3 +1,4 @@+import type { ColorName } from "metabase/lib/colors/types";import type * as Lib from "metabase-lib";import type Question from "metabase-lib/v1/Question";@@ -54,7 +55,7 @@ export interface NotebookStepProps {step: NotebookStep;query: Lib.Query;stageIndex: number;- color: string;+ color: ColorName;isLastOpened: boolean;reportTimezone: string;readOnly?: boolean;@@ -65,7 +66,7 @@ export interface NotebookStepProps {export interface NotebookStepHeaderProps {step: NotebookStep;title: string;- color: string;+ color: ColorName;canRevert: boolean;onRevert?: () => void;}diff --git a/frontend/src/metabase/querying/segments/components/SegmentEditor/ClauseStep/ClauseStep.module.css b/frontend/src/metabase/querying/segments/components/SegmentEditor/ClauseStep/ClauseStep.module.cssindex a7a6a3cc3cd..8502e6e1870 100644--- a/frontend/src/metabase/querying/segments/components/SegmentEditor/ClauseStep/ClauseStep.module.css+++ b/frontend/src/metabase/querying/segments/components/SegmentEditor/ClauseStep/ClauseStep.module.css@@ -15,7 +15,7 @@border-style: solid;border-color: var(--mb-color-border);border-width: 0 1px 1px 0;- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);transform: rotate(-45deg);}}@@ -37,7 +37,7 @@left: 0.5rem;padding: 0 0.5rem;transform: translateY(-50%);- color: var(--mb-color-text-medium);- background-color: var(--mb-color-bg-white);+ color: var(--mb-color-text-secondary);+ background-color: var(--mb-color-background-primary);text-transform: uppercase;}diff --git a/frontend/src/metabase/querying/segments/components/SegmentEditor/DataStep/DataStep.tsx b/frontend/src/metabase/querying/segments/components/SegmentEditor/DataStep/DataStep.tsxindex fe4673c6694..a64c23dedb0 100644--- a/frontend/src/metabase/querying/segments/components/SegmentEditor/DataStep/DataStep.tsx+++ b/frontend/src/metabase/querying/segments/components/SegmentEditor/DataStep/DataStep.tsx@@ -65,7 +65,7 @@ export function DataStep({<Box>{tableId && (<Flex maw={300} wrap="nowrap">- <Text c="text-medium" size="sm" w="100%">+ <Text c="text-secondary" size="sm" w="100%"><TableBreadcrumbs hideTableName tableId={tableId} /></Text></Flex>@@ -75,14 +75,14 @@ export function DataStep({<Buttonvariant="subtle"p={0}- c="text-dark"+ c="text-primary"rightSection={<Icon name="chevrondown" />}onClick={() => setIsOpened(true)}>{tableInfo ? tableInfo.displayName : t`Select a table`}</Button>) : (- <Text c="text-dark" fw="bold">+ <Text c="text-primary" fw="bold">{tableInfo?.displayName}</Text>)}diff --git a/frontend/src/metabase/querying/segments/components/SegmentEditor/FilterStep/FilterStep.tsx b/frontend/src/metabase/querying/segments/components/SegmentEditor/FilterStep/FilterStep.tsxindex 6c1f73d6c62..1726a6c6eb8 100644--- a/frontend/src/metabase/querying/segments/components/SegmentEditor/FilterStep/FilterStep.tsx+++ b/frontend/src/metabase/querying/segments/components/SegmentEditor/FilterStep/FilterStep.tsx@@ -127,7 +127,7 @@ const AddFilterButton = forwardRef(function AddFilterButton(return (<Buttonref={ref}- c="text-light"+ c="text-tertiary"p={compact ? undefined : 0}variant={compact ? "default" : "subtle"}size={compact ? "compact-md" : "md"}diff --git a/frontend/src/metabase/questions/components/CollectionBadge.tsx b/frontend/src/metabase/questions/components/CollectionBadge.tsxindex 341d7d1072f..906fb4a8114 100644--- a/frontend/src/metabase/questions/components/CollectionBadge.tsx+++ b/frontend/src/metabase/questions/components/CollectionBadge.tsx@@ -52,7 +52,7 @@ const CollectionBadgeInner = ({className={className}icon={icon}activeColor={icon.color}- inactiveColor="text-light"+ inactiveColor="text-tertiary"isSingleLine={isSingleLine}{...clickActionProps}>diff --git a/frontend/src/metabase/questions/components/MoveCardModal/MoveCardToast/MoveCardToast.styled.tsx b/frontend/src/metabase/questions/components/MoveCardModal/MoveCardToast/MoveCardToast.styled.tsxindex 370b6ab2e1e..2d1d5213728 100644--- a/frontend/src/metabase/questions/components/MoveCardModal/MoveCardToast/MoveCardToast.styled.tsx+++ b/frontend/src/metabase/questions/components/MoveCardModal/MoveCardToast/MoveCardToast.styled.tsx@@ -10,7 +10,7 @@ export const ToastRoot = styled.div``;export const StyledIcon = styled(Icon)`- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);margin-right: var(--mantine-spacing-sm);`;diff --git a/frontend/src/metabase/reference/Reference.module.css b/frontend/src/metabase/reference/Reference.module.cssindex 748931e86b1..8394f2d2470 100644--- a/frontend/src/metabase/reference/Reference.module.css+++ b/frontend/src/metabase/reference/Reference.module.css@@ -1,6 +1,6 @@:root {- --title-color: var(--mb-color-text-medium);- --subtitle-color: var(--mb-color-text-medium);+ --title-color: var(--mb-color-text-secondary);+ --subtitle-color: var(--mb-color-text-secondary);--icon-width: 60px;}@@ -28,9 +28,9 @@line-height: 1.4em;letter-spacing: 1px;white-space: pre-wrap;- color: var(--mb-color-text-medium);- background-color: var(--mb-color-bg-light);- border: 1px solid var(--mb-color-text-light);+ color: var(--mb-color-text-secondary);+ background-color: var(--mb-color-background-secondary);+ border: 1px solid var(--mb-color-text-tertiary);border-radius: 4px;padding: 0.2em 0.4em;}diff --git a/frontend/src/metabase/reference/components/Detail.module.css b/frontend/src/metabase/reference/components/Detail.module.cssindex 35e454df713..82a6400a63d 100644--- a/frontend/src/metabase/reference/components/Detail.module.css+++ b/frontend/src/metabase/reference/components/Detail.module.css@@ -1,6 +1,6 @@:root {- --title-color: var(--mb-color-text-medium);- --muted-color: var(--mb-color-text-light);+ --title-color: var(--mb-color-text-secondary);+ --muted-color: var(--mb-color-text-tertiary);}.detail {diff --git a/frontend/src/metabase/reference/components/EditHeader.module.css b/frontend/src/metabase/reference/components/EditHeader.module.cssindex 5a766cd54be..71feaa85e50 100644--- a/frontend/src/metabase/reference/components/EditHeader.module.css+++ b/frontend/src/metabase/reference/components/EditHeader.module.css@@ -7,7 +7,6 @@left: 0;right: 0;height: 40px;- background-color: var(--mb-color-bg-white-alpha-15);}.editHeaderButtons {diff --git a/frontend/src/metabase/reference/components/Field.module.css b/frontend/src/metabase/reference/components/Field.module.cssindex 18fe917c757..4e76c2d8381 100644--- a/frontend/src/metabase/reference/components/Field.module.css+++ b/frontend/src/metabase/reference/components/Field.module.css@@ -1,5 +1,5 @@:root {- --title-color: var(--mb-color-text-medium);+ --title-color: var(--mb-color-text-secondary);}.field {diff --git a/frontend/src/metabase/reference/components/Formula.module.css b/frontend/src/metabase/reference/components/Formula.module.cssindex af8418e5fa1..2696c61aaea 100644--- a/frontend/src/metabase/reference/components/Formula.module.css+++ b/frontend/src/metabase/reference/components/Formula.module.css@@ -1,6 +1,6 @@.formula {composes: bordered rounded from "style";- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);cursor: pointer;}diff --git a/frontend/src/metabase/reference/components/ReferenceHeader.module.css b/frontend/src/metabase/reference/components/ReferenceHeader.module.cssindex d0cd954e6ba..cead5266df3 100644--- a/frontend/src/metabase/reference/components/ReferenceHeader.module.css+++ b/frontend/src/metabase/reference/components/ReferenceHeader.module.css@@ -1,5 +1,5 @@:root {- --title-color: var(--mb-color-text-medium);+ --title-color: var(--mb-color-text-secondary);}.headerBody {diff --git a/frontend/src/metabase/reference/glossary/Glossary.module.css b/frontend/src/metabase/reference/glossary/Glossary.module.cssindex 2f046b6cc0f..233b8e01781 100644--- a/frontend/src/metabase/reference/glossary/Glossary.module.css+++ b/frontend/src/metabase/reference/glossary/Glossary.module.css@@ -4,7 +4,7 @@.table {table-layout: fixed;- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);border: none;th {diff --git a/frontend/src/metabase/reference/glossary/GlossaryTable.tsx b/frontend/src/metabase/reference/glossary/GlossaryTable.tsxindex a2b414fdfb1..826b88e686b 100644--- a/frontend/src/metabase/reference/glossary/GlossaryTable.tsx+++ b/frontend/src/metabase/reference/glossary/GlossaryTable.tsx@@ -207,7 +207,7 @@ export function GlossaryTable({<ActionIconaria-label={t`Delete`}variant="subtle"- c="text-light"+ c="text-tertiary"className={cx(S.action)}onClick={() => setDeletingItem(item)}>diff --git a/frontend/src/metabase/rich_text_editing/tiptap/components/EditorBubbleMenu/EditorBubbleMenu.module.css b/frontend/src/metabase/rich_text_editing/tiptap/components/EditorBubbleMenu/EditorBubbleMenu.module.cssindex b73e8dad89f..a6a42477b76 100644--- a/frontend/src/metabase/rich_text_editing/tiptap/components/EditorBubbleMenu/EditorBubbleMenu.module.css+++ b/frontend/src/metabase/rich_text_editing/tiptap/components/EditorBubbleMenu/EditorBubbleMenu.module.css@@ -2,5 +2,5 @@border: 1px solid var(--mb-color-border);border-radius: var(--mantine-radius-sm);box-shadow: 0 2px 12px var(--mb-color-shadow);- background: var(--mb-color-background);+ background: var(--mb-color-background-primary);}diff --git a/frontend/src/metabase/rich_text_editing/tiptap/components/FormatButton/FormatButton.tsx b/frontend/src/metabase/rich_text_editing/tiptap/components/FormatButton/FormatButton.tsxindex b42b3c3de8d..d2848835541 100644--- a/frontend/src/metabase/rich_text_editing/tiptap/components/FormatButton/FormatButton.tsx+++ b/frontend/src/metabase/rich_text_editing/tiptap/components/FormatButton/FormatButton.tsx@@ -26,8 +26,8 @@ export const FormatButton: React.FC<FormatButtonProps> = ({w="32px"h="32px"display="flex"- c={isActive ? "var(--mb-color-brand)" : "var(--mb-color-text-dark)"}- bg={isActive ? "var(--mb-color-bg-light)" : "transparent"}+ c={isActive ? "brand" : "text-primary"}+ bg={isActive ? "background-secondary" : "transparent"}fz={14}fw="bold"className={S.button}diff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/CardEmbedNode.module.css b/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/CardEmbedNode.module.cssindex 62925b38458..8fc973075ad 100644--- a/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/CardEmbedNode.module.css+++ b/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/CardEmbedNode.module.css@@ -17,7 +17,7 @@display: flex;flex-direction: column;height: 100%;- background: var(--mb-color-background);+ background: var(--mb-color-background-primary);overflow: hidden;}@@ -69,6 +69,7 @@opacity: 0;transition: opacity 0.2s ease;flex-shrink: 0;+ cursor: pointer;}.titleContainer:hover .titleEditIcon {@@ -81,6 +82,6 @@border-radius: var(--mantine-radius-xs);&:hover {- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);}}diff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/CardEmbedNode.tsx b/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/CardEmbedNode.tsxindex 6fbad7981c0..04a995b6ea0 100644--- a/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/CardEmbedNode.tsx+++ b/frontend/src/metabase/rich_text_editing/tiptap/extensions/CardEmbed/CardEmbedNode.tsx@@ -436,7 +436,7 @@ export const CardEmbedComponent = memo(<Box className={styles.questionHeader}><Flex align="center" justify="space-between" gap="0.5rem"><Box className={styles.titleContainer}>- <Text size="md" color="text-dark" fw={700}>+ <Text size="md" color="text-primary" fw={700}>{t`Loading question...`}</Text></Box>@@ -541,7 +541,8 @@ export const CardEmbedComponent = memo(backgroundColor: "transparent","&:focus": {border: "1px solid var(--mb-color-border)",- backgroundColor: "var(--mb-color-bg-white)",+ backgroundColor:+ "var(--mb-color-background-primary)",padding: "0 0.25rem",},},@@ -554,13 +555,15 @@ export const CardEmbedComponent = memo(className={styles.titleText}data-testid="card-embed-title"size="md"- color="text-dark"+ c="text-primary"fw={700}- c={isPublicDocument ? undefined : "pointer"}truncate="end"onClick={isPublicDocument ? undefined : handleTitleClick}+ style={{+ cursor: isPublicDocument ? undefined : "pointer",+ }}>{displayName}</Text>@@ -569,9 +572,8 @@ export const CardEmbedComponent = memo(<Iconname="pencil"size={14}- color="var(--mb-color-text-medium)"+ c="text-secondary"className={styles.titleEditIcon}- c="pointer"onClick={(e: React.MouseEvent) => {e.stopPropagation();setEditedTitle(displayName);@@ -621,7 +623,7 @@ export const CardEmbedComponent = memo(<Iconname="ellipsis"size={16}- color="var(--mb-color-text-medium)"+ c="text-secondary"/></Flex></Menu.Target>diff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/Command/CommandSuggestion.tsx b/frontend/src/metabase/rich_text_editing/tiptap/extensions/Command/CommandSuggestion.tsxindex 3899a7b17a0..6136500d71f 100644--- a/frontend/src/metabase/rich_text_editing/tiptap/extensions/Command/CommandSuggestion.tsx+++ b/frontend/src/metabase/rich_text_editing/tiptap/extensions/Command/CommandSuggestion.tsx@@ -78,7 +78,7 @@ const CommandMenuItem = forwardRef<><Group gap="sm" wrap="nowrap" align="center">{option.icon ? (- <Icon name={option.icon} size={16} color="inherit" />+ <Icon name={option.icon} size={16} c="inherit" />) : option.text ? (<Box w={16} h={16} className={CommandS.iconContainer}><Text size="xs" fw={700} c="inherit">@@ -481,7 +481,7 @@ export const CommandSuggestion = forwardRef<) : (<><Box p="sm" ta="center">- <Text size="md" c="text-medium">{t`No results found`}</Text>+ <Text size="md" c="text-secondary">{t`No results found`}</Text></Box>{query && (<>diff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/LinkHoverMenu/LinkHoverMenu.tsx b/frontend/src/metabase/rich_text_editing/tiptap/extensions/LinkHoverMenu/LinkHoverMenu.tsxindex 5c75d8b4c73..0cd5e84026e 100644--- a/frontend/src/metabase/rich_text_editing/tiptap/extensions/LinkHoverMenu/LinkHoverMenu.tsx+++ b/frontend/src/metabase/rich_text_editing/tiptap/extensions/LinkHoverMenu/LinkHoverMenu.tsx@@ -119,7 +119,7 @@ export const LinkHoverMenu = ({ editor, editable }: LinkHoverMenuProps) => {{editable && (<ActionIconml="sm"- c="var(--mb-color-text-secondary)"+ c="text-secondary"onClick={() => {editor.commands.focus();const pos = editor.view.posAtDOM(hoveredLink, 0);diff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/MetabotEmbed/MetabotEmbed.module.css b/frontend/src/metabase/rich_text_editing/tiptap/extensions/MetabotEmbed/MetabotEmbed.module.cssindex 300b9f17799..008fc8a2e2e 100644--- a/frontend/src/metabase/rich_text_editing/tiptap/extensions/MetabotEmbed/MetabotEmbed.module.css+++ b/frontend/src/metabase/rich_text_editing/tiptap/extensions/MetabotEmbed/MetabotEmbed.module.css@@ -14,7 +14,7 @@position: absolute;pointer-events: none;padding: var(--mantine-spacing-md);- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);}.borderRadius {diff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/MetabotEmbed/MetabotEmbed.tsx b/frontend/src/metabase/rich_text_editing/tiptap/extensions/MetabotEmbed/MetabotEmbed.tsxindex 36e478fd9a5..1f0fe1f1305 100644--- a/frontend/src/metabase/rich_text_editing/tiptap/extensions/MetabotEmbed/MetabotEmbed.tsx+++ b/frontend/src/metabase/rich_text_editing/tiptap/extensions/MetabotEmbed/MetabotEmbed.tsx@@ -288,7 +288,7 @@ export const MetabotComponent = memo(return (<NodeViewWrapper><Flex- bg="bg-light"+ bg="background-secondary"bd="1px solid var(--border-color)"className={S.borderRadius}pos="relative"diff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/MetabotMention/MetabotSuggestion.tsx b/frontend/src/metabase/rich_text_editing/tiptap/extensions/MetabotMention/MetabotSuggestion.tsxindex 57059fa9223..f530c13e7ca 100644--- a/frontend/src/metabase/rich_text_editing/tiptap/extensions/MetabotMention/MetabotSuggestion.tsx+++ b/frontend/src/metabase/rich_text_editing/tiptap/extensions/MetabotMention/MetabotSuggestion.tsx@@ -151,7 +151,7 @@ const MetabotMentionSuggestionComponent = forwardRef<))}{query.length > 0 && totalItems === 0 && !isLoading ? (<Box p="sm">- <Text size="md" c="text-medium" ta="center">+ <Text size="md" c="text-secondary" ta="center">{t`No results found`}</Text></Box>diff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/SupportingText/SupportingText.module.css b/frontend/src/metabase/rich_text_editing/tiptap/extensions/SupportingText/SupportingText.module.cssindex 2a72bba5bdc..acb91aefbb8 100644--- a/frontend/src/metabase/rich_text_editing/tiptap/extensions/SupportingText/SupportingText.module.css+++ b/frontend/src/metabase/rich_text_editing/tiptap/extensions/SupportingText/SupportingText.module.css@@ -2,7 +2,7 @@height: 100%;position: relative;border-radius: var(--mantine-radius-md);- background-color: var(--mb-color-background-light);+ background-color: var(--mb-color-background-secondary);border: 1px solid transparent;transition:background-color 150ms,@@ -11,8 +11,8 @@&:hover {background-color: color-mix(in srgb,- var(--mb-color-background-inverse) 2%,- var(--mb-color-background-light)+ var(--mb-color-background-primary-inverse) 2%,+ var(--mb-color-background-secondary));}@@ -67,7 +67,7 @@.placeholder {position: absolute;pointer-events: none;- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);}.commentsButton[data-variant="default"]:not(:hover) {diff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/shared/EntitySearchSection.tsx b/frontend/src/metabase/rich_text_editing/tiptap/extensions/shared/EntitySearchSection.tsxindex 9f3d8a87f00..b50ae0780a3 100644--- a/frontend/src/metabase/rich_text_editing/tiptap/extensions/shared/EntitySearchSection.tsx+++ b/frontend/src/metabase/rich_text_editing/tiptap/extensions/shared/EntitySearchSection.tsx@@ -65,7 +65,7 @@ export function EntitySearchSection({<>{selectedSearchModelName && (<Box py="xs">- <Text size="sm" c="text-light" fw="bold">+ <Text size="sm" c="text-tertiary" fw="bold">{selectedSearchModelName}</Text></Box>@@ -90,7 +90,7 @@ export function EntitySearchSection({{shouldShowNoResults ? (<Box p="sm" ta="center">- <Text size="md" c="text-medium">{t`No results found`}</Text>+ <Text size="md" c="text-secondary">{t`No results found`}</Text></Box>) : null}diff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/shared/NativeQueryModal.tsx b/frontend/src/metabase/rich_text_editing/tiptap/extensions/shared/NativeQueryModal.tsxindex 97572d525f0..16aba19d654 100644--- a/frontend/src/metabase/rich_text_editing/tiptap/extensions/shared/NativeQueryModal.tsx+++ b/frontend/src/metabase/rich_text_editing/tiptap/extensions/shared/NativeQueryModal.tsx@@ -97,13 +97,13 @@ const QueryExecutionEmptyState = ({<Box maw="3rem" mb="0.75rem"><img src={EmptyCodeResult} alt="Code prompt icon" /></Box>- <Text c="text-medium">+ <Text c="text-secondary">{c("{0} refers to the keyboard shortcut").jt`To run your code, click on the Run button or type ${(<b key="shortcut">({keyboardShortcut})</b>)}`}</Text>- <Text c="text-medium">{t`Here's where your results will appear`}</Text>+ <Text c="text-secondary">{t`Here's where your results will appear`}</Text></Stack></Flex>);@@ -445,7 +445,7 @@ export const NativeQueryModal = ({<Boxw="350px"miw="350px"- bg="var(--mb-color-bg-white)"+ bg="background-primary"className={S.dataReferenceSidebar}><DataReference@@ -472,7 +472,7 @@ export const NativeQueryModal = ({justify="flex-end"gap="0.5rem"p="1rem"- bg="var(--mb-color-bg-white)"+ bg="background-primary"className={S.footer}><Button variant="subtle" onClick={onClose}>diff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/suggestionRenderer.tsx b/frontend/src/metabase/rich_text_editing/tiptap/extensions/suggestionRenderer.tsxindex 44e4cc0f244..864791c81d2 100644--- a/frontend/src/metabase/rich_text_editing/tiptap/extensions/suggestionRenderer.tsx+++ b/frontend/src/metabase/rich_text_editing/tiptap/extensions/suggestionRenderer.tsx@@ -94,7 +94,7 @@ export const createSuggestionRenderer = <I = unknown, TSelected = unknown>(top: `${pos.y}px`,position: "fixed",zIndex: 200,- backgroundColor: "var(--mb-color-background)",+ backgroundColor: "var(--mb-color-background-primary)",border: "1px solid var(--mb-color-border)",borderRadius: "8px",boxShadow: "0 4px 10px var(--mb-color-shadow)",diff --git a/frontend/src/metabase/search/components/InfoText/InfoTextAssetLink.tsx b/frontend/src/metabase/search/components/InfoText/InfoTextAssetLink.tsxindex c6edfdb9295..6585d611e82 100644--- a/frontend/src/metabase/search/components/InfoText/InfoTextAssetLink.tsx+++ b/frontend/src/metabase/search/components/InfoText/InfoTextAssetLink.tsx@@ -20,14 +20,14 @@ type InfoTextAssetLinkProps = {};const LinkSeparator = (- <Box component="span" c="text-medium">+ <Box component="span" c="text-secondary"><Icon name="chevronright" size={8} /></Box>);const LoadingText = () => (<Text- color="text-1"+ c="text-primary"spansize="sm"truncatediff --git a/frontend/src/metabase/search/components/InfoText/InfoTextEditedInfo.styled.tsx b/frontend/src/metabase/search/components/InfoText/InfoTextEditedInfo.styled.tsxindex b944d0cbbb1..e98191504c5 100644--- a/frontend/src/metabase/search/components/InfoText/InfoTextEditedInfo.styled.tsx+++ b/frontend/src/metabase/search/components/InfoText/InfoTextEditedInfo.styled.tsx@@ -9,7 +9,7 @@ import { breakpointMaxSmall } from "metabase/styled-components/theme";export const LastEditedInfoText = styled(LastEditInfoLabel)`${({ theme }) => {return css`- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);font-size: ${theme.fontSizes.sm};font-weight: 500;diff --git a/frontend/src/metabase/search/components/InfoText/InfoTextEditedInfo.tsx b/frontend/src/metabase/search/components/InfoText/InfoTextEditedInfo.tsxindex 0e70cca775d..4a4cc3e5033 100644--- a/frontend/src/metabase/search/components/InfoText/InfoTextEditedInfo.tsx+++ b/frontend/src/metabase/search/components/InfoText/InfoTextEditedInfo.tsx@@ -16,7 +16,7 @@ import {const LoadingText = () => (<Text- color="text-1"+ c="text-primary"spansize="sm"truncate@@ -25,7 +25,7 @@ const LoadingText = () => ();const InfoTextSeparator = (- <Text component="span" size="sm" mx="xs" c="text-medium">+ <Text component="span" size="sm" mx="xs" c="text-secondary">•</Text>);@@ -89,7 +89,7 @@ export const InfoTextEditedInfo = ({const formattedDuration = timestamp && getRelativeTime(timestamp);return (<Tooltip label={<LastEditedInfoTooltip {...lastEditedInfoData} />}>- <Text component="span" size="sm" c="text-medium" truncate>+ <Text component="span" size="sm" c="text-secondary" truncate>{formattedDuration}</Text></Tooltip>diff --git a/frontend/src/metabase/search/components/SearchResult/SearchResult.styled.tsx b/frontend/src/metabase/search/components/SearchResult/SearchResult.styled.tsxindex 06673926767..6c983da514e 100644--- a/frontend/src/metabase/search/components/SearchResult/SearchResult.styled.tsx+++ b/frontend/src/metabase/search/components/SearchResult/SearchResult.styled.tsx@@ -28,7 +28,7 @@ export const ResultTitle = styled(Anchor)<line-height: unset;font-weight: 700;font-size: ${({ theme }) => theme.fontSizes.md};- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);&:hover,&:focus-visible,diff --git a/frontend/src/metabase/search/components/SearchResult/components/CollectionIcon.tsx b/frontend/src/metabase/search/components/SearchResult/components/CollectionIcon.tsxindex 45087048bf1..ac348577af7 100644--- a/frontend/src/metabase/search/components/SearchResult/components/CollectionIcon.tsx+++ b/frontend/src/metabase/search/components/SearchResult/components/CollectionIcon.tsx@@ -10,7 +10,7 @@ import type { IconComponentProps } from "./ItemIcon";export function CollectionIcon({ item }: { item: IconComponentProps["item"] }) {const icon = getIcon(item);- icon.color = icon.color ? icon.color : "text-light";+ icon.color = icon.color ? icon.color : "text-tertiary";return (<Icondiff --git a/frontend/src/metabase/search/components/SearchResult/components/Context.styled.tsx b/frontend/src/metabase/search/components/SearchResult/components/Context.styled.tsxindex 15da4cafd1f..5356c0c70ba 100644--- a/frontend/src/metabase/search/components/SearchResult/components/Context.styled.tsx+++ b/frontend/src/metabase/search/components/SearchResult/components/Context.styled.tsx@@ -3,7 +3,7 @@ import styled from "@emotion/styled";export const ContextText = styled("p")`line-height: 1.4em;- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);margin-top: 0;`;diff --git a/frontend/src/metabase/search/components/SearchResult/components/ItemIcon.styled.tsx b/frontend/src/metabase/search/components/SearchResult/components/ItemIcon.styled.tsxindex 681d32ad59a..101ce4dfba0 100644--- a/frontend/src/metabase/search/components/SearchResult/components/ItemIcon.styled.tsx+++ b/frontend/src/metabase/search/components/SearchResult/components/ItemIcon.styled.tsx@@ -11,7 +11,7 @@ function getColorForIconWrapper(type: SearchModel,) {if (!active || archived) {- return color("text-medium");+ return color("text-secondary");}if (type === "collection") {return lighten("brand", 0.35);@@ -34,5 +34,5 @@ export const IconWrapper = styled.div<{color: ${({ active, archived, type }) =>getColorForIconWrapper(active, archived, type)};flex-shrink: 0;- background: var(--mb-color-bg-white);+ background: var(--mb-color-background-primary);`;diff --git a/frontend/src/metabase/search/components/SearchResultLink/SearchResultLink.tsx b/frontend/src/metabase/search/components/SearchResultLink/SearchResultLink.tsxindex e6cf861b0ca..820ade9622d 100644--- a/frontend/src/metabase/search/components/SearchResultLink/SearchResultLink.tsx+++ b/frontend/src/metabase/search/components/SearchResultLink/SearchResultLink.tsx@@ -40,7 +40,7 @@ export const SearchResultLink = ({<ResultLink{...componentProps}span- c="text-medium"+ c="text-secondary"size="sm"truncateref={truncatedRef}diff --git a/frontend/src/metabase/search/components/ToggleSidebarFilter/ToggleSidebarFilter.tsx b/frontend/src/metabase/search/components/ToggleSidebarFilter/ToggleSidebarFilter.tsxindex fa448882668..bdb7244ef37 100644--- a/frontend/src/metabase/search/components/ToggleSidebarFilter/ToggleSidebarFilter.tsx+++ b/frontend/src/metabase/search/components/ToggleSidebarFilter/ToggleSidebarFilter.tsx@@ -23,7 +23,7 @@ export const ToggleSidebarFilter = ({data-testid="toggle-filter-switch"size="sm"labelPosition="left"- label={<Text color="text-dark">{label()}</Text>}+ label={<Text color="text-primary">{label()}</Text>}data-is-checked={value}checked={value}onChange={(event) => onChange(event.currentTarget.checked)}diff --git a/frontend/src/metabase/setup/components/ActiveStep/ActiveStep.styled.tsx b/frontend/src/metabase/setup/components/ActiveStep/ActiveStep.styled.tsxindex 0939f115556..66235bb9e59 100644--- a/frontend/src/metabase/setup/components/ActiveStep/ActiveStep.styled.tsx+++ b/frontend/src/metabase/setup/components/ActiveStep/ActiveStep.styled.tsx@@ -9,7 +9,7 @@ export const StepRoot = styled.section`margin-bottom: 1.75rem;border: 1px solid var(--mb-color-border);border-radius: 0.5rem;- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);${breakpointMinSmall} {padding: 4rem;@@ -35,7 +35,7 @@ export const StepLabel = styled.div`height: 2.625rem;border: 1px solid var(--mb-color-border);border-radius: 50%;- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);`;export const StepLabelText = styled.span`diff --git a/frontend/src/metabase/setup/components/CompletedStep/CompletedStep.styled.tsx b/frontend/src/metabase/setup/components/CompletedStep/CompletedStep.styled.tsxindex 9ef86086091..dbde6a59421 100644--- a/frontend/src/metabase/setup/components/CompletedStep/CompletedStep.styled.tsx+++ b/frontend/src/metabase/setup/components/CompletedStep/CompletedStep.styled.tsx@@ -7,7 +7,7 @@ export const StepRoot = styled.section`padding: 2.5rem;border: 1px solid var(--mb-color-border);border-radius: 0.5rem;- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);gap: 32px;margin-bottom: 1.75rem;`;diff --git a/frontend/src/metabase/setup/components/DataUsageStep/DataUsageStep.styled.tsx b/frontend/src/metabase/setup/components/DataUsageStep/DataUsageStep.styled.tsxindex 82e5858a475..6da8095a7d0 100644--- a/frontend/src/metabase/setup/components/DataUsageStep/DataUsageStep.styled.tsx+++ b/frontend/src/metabase/setup/components/DataUsageStep/DataUsageStep.styled.tsx@@ -5,7 +5,7 @@ import Toggle from "metabase/common/components/Toggle";export const StepDescription = styled.div`margin: 0.875rem 0 1.25rem;- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);`;export const StepToggleContainer = styled.div`@@ -22,13 +22,13 @@ export const StepToggle = styled(Toggle)``;export const StepToggleLabel = styled.div`- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);margin-left: 0.5rem;`;export const StepInfoList = styled.ul`margin: 0 0 1.25rem;- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);list-style: disc inside;line-height: 2;`;diff --git a/frontend/src/metabase/setup/components/InactiveStep/InactiveStep.styled.tsx b/frontend/src/metabase/setup/components/InactiveStep/InactiveStep.styled.tsxindex af75efbc90f..56617f57261 100644--- a/frontend/src/metabase/setup/components/InactiveStep/InactiveStep.styled.tsx+++ b/frontend/src/metabase/setup/components/InactiveStep/InactiveStep.styled.tsx@@ -15,7 +15,7 @@ export const StepRoot = styled.section<Props>`padding: 1rem 2rem;margin-bottom: 1.75rem;background-color: ${(props) =>- color(props.isCompleted ? "bg-white" : "bg-medium")};+ color(props.isCompleted ? "background-primary" : "background-tertiary")};`;export const StepTitle = styled.div<Props>`@@ -39,7 +39,7 @@ export const StepLabel = styled.div<Props>`${(props) => (props.isCompleted ? color("success") : color("border"))};border-radius: 50%;background-color: ${(props) =>- props.isCompleted ? color("success") : color("bg-white")};+ props.isCompleted ? color("success") : color("background-primary")};`;export const StepLabelText = styled.span`@@ -51,5 +51,5 @@ export const StepLabelText = styled.span`export const StepLabelIcon = styled(Icon)`width: 1rem;height: 1rem;- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);`;diff --git a/frontend/src/metabase/setup/components/LanguageStep/LanguageStep.styled.tsx b/frontend/src/metabase/setup/components/LanguageStep/LanguageStep.styled.tsxindex 1c586dd1537..0ba67d86aeb 100644--- a/frontend/src/metabase/setup/components/LanguageStep/LanguageStep.styled.tsx+++ b/frontend/src/metabase/setup/components/LanguageStep/LanguageStep.styled.tsx@@ -4,7 +4,7 @@ import styled from "@emotion/styled";import { color } from "metabase/ui/utils/colors";export const StepDescription = styled.div`- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);margin: 0.875rem 0;`;@@ -35,15 +35,16 @@ interface LocaleContainerProps {export const LocaleButton = styled.span<LocaleContainerProps>`display: block;padding: 0.5rem;- color: ${(props) => color(props.checked ? "text-white" : "text-dark")};+ color: ${(props) =>+ color(props.checked ? "text-primary-inverse" : "text-primary")};border-radius: 0.25rem;background-color: ${(props) =>- props.checked ? color("brand") : color("bg-white")};+ props.checked ? color("brand") : color("background-primary")};font-weight: 700;border: 2px solid var(--mb-color-white);&:hover {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);background-color: var(--mb-color-brand);}diff --git a/frontend/src/metabase/setup/components/LicenseTokenStep/LicenseTokenForm.tsx b/frontend/src/metabase/setup/components/LicenseTokenStep/LicenseTokenForm.tsxindex 408c7e6bb88..e81114f6dde 100644--- a/frontend/src/metabase/setup/components/LicenseTokenStep/LicenseTokenForm.tsx+++ b/frontend/src/metabase/setup/components/LicenseTokenStep/LicenseTokenForm.tsx@@ -108,7 +108,7 @@ export const LicenseTokenForm = ({px={0}fw="normal">{t`I'll activate later`}</Button>- <Text c="text-light" size="sm">+ <Text c="text-tertiary" size="sm">{t`You won't have access to paid features until you activate.`}</Text></Box>diff --git a/frontend/src/metabase/setup/components/LicenseTokenStep/LicenseTokenStep.tsx b/frontend/src/metabase/setup/components/LicenseTokenStep/LicenseTokenStep.tsxindex ce664ff43a7..7e26363cc11 100644--- a/frontend/src/metabase/setup/components/LicenseTokenStep/LicenseTokenStep.tsx+++ b/frontend/src/metabase/setup/components/LicenseTokenStep/LicenseTokenStep.tsx@@ -58,7 +58,7 @@ export const LicenseTokenStep = ({ stepLabel }: NumberedStepProps) => {><Textmb="lg"- c="text-light"+ c="text-tertiary">{t`Unlock access to paid features if you'd like to try them out`}</Text><LicenseTokenFormdiff --git a/frontend/src/metabase/setup/components/SettingsPage/SettingsPage.tsx b/frontend/src/metabase/setup/components/SettingsPage/SettingsPage.tsxindex 29b34d50db1..83e1a1ead17 100644--- a/frontend/src/metabase/setup/components/SettingsPage/SettingsPage.tsx+++ b/frontend/src/metabase/setup/components/SettingsPage/SettingsPage.tsx@@ -38,7 +38,7 @@ export const SettingsPage = (): JSX.Element => {const TOOLTIP_WIDTH = 220;const label = (- <Text size="sm" c="var(--mb-color-tooltip-text)">+ <Text size="sm" c="tooltip-text">{tooltipText}</Text>);diff --git a/frontend/src/metabase/setup/components/SetupHelp/SetupHelp.styled.tsx b/frontend/src/metabase/setup/components/SetupHelp/SetupHelp.styled.tsxindex a5b3fbe3284..425659dc3ef 100644--- a/frontend/src/metabase/setup/components/SetupHelp/SetupHelp.styled.tsx+++ b/frontend/src/metabase/setup/components/SetupHelp/SetupHelp.styled.tsx@@ -2,7 +2,7 @@import styled from "@emotion/styled";export const SetupFooterRoot = styled.footer`- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);padding: 1rem;margin-bottom: 2rem;border: 1px dashed var(--mb-color-border);diff --git a/frontend/src/metabase/setup/components/SetupSection/SetupSection.styled.tsx b/frontend/src/metabase/setup/components/SetupSection/SetupSection.styled.tsxindex e58a19775b3..cf181227133 100644--- a/frontend/src/metabase/setup/components/SetupSection/SetupSection.styled.tsx+++ b/frontend/src/metabase/setup/components/SetupSection/SetupSection.styled.tsx@@ -21,12 +21,12 @@ export const SectionContainer = styled.div``;export const SectionTitle = styled.div`- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);font-weight: 700;`;export const SectionDescription = styled.div`- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);margin-top: 0.5rem;`;diff --git a/frontend/src/metabase/setup/components/UsageQuestionStep/UsageQuestionStep.tsx b/frontend/src/metabase/setup/components/UsageQuestionStep/UsageQuestionStep.tsxindex fb9a67f0011..7fb32f2afed 100644--- a/frontend/src/metabase/setup/components/UsageQuestionStep/UsageQuestionStep.tsx+++ b/frontend/src/metabase/setup/components/UsageQuestionStep/UsageQuestionStep.tsx@@ -65,7 +65,7 @@ export const UsageQuestionStep = ({ stepLabel }: NumberedStepProps) => {onChange={handleChange}label={<Text- color="text-light"+ color="text-tertiary"fw="normal">{t`Let us know your plans with Metabase so that we can best guide you`}</Text>}diff --git a/frontend/src/metabase/setup/components/UserStep/UserStep.styled.tsx b/frontend/src/metabase/setup/components/UserStep/UserStep.styled.tsxindex f847a3c5613..ece43d8e1a4 100644--- a/frontend/src/metabase/setup/components/UserStep/UserStep.styled.tsx+++ b/frontend/src/metabase/setup/components/UserStep/UserStep.styled.tsx@@ -2,6 +2,6 @@import styled from "@emotion/styled";export const StepDescription = styled.div`- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);margin-top: 0.875rem;`;diff --git a/frontend/src/metabase/setup/components/WelcomePage/WelcomePage.styled.tsx b/frontend/src/metabase/setup/components/WelcomePage/WelcomePage.styled.tsxindex 6e5ff49c690..4dc709642f4 100644--- a/frontend/src/metabase/setup/components/WelcomePage/WelcomePage.styled.tsx+++ b/frontend/src/metabase/setup/components/WelcomePage/WelcomePage.styled.tsx@@ -27,7 +27,7 @@ export const PageTitle = styled.h1``;export const PageBody = styled.div`- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);font-size: 1.286em;line-height: 1.457em;margin: 1rem 0;diff --git a/frontend/src/metabase/static-viz/components/Gauge/Gauge.tsx b/frontend/src/metabase/static-viz/components/Gauge/Gauge.tsxindex 713ef9bfa53..36927911e7e 100644--- a/frontend/src/metabase/static-viz/components/Gauge/Gauge.tsx+++ b/frontend/src/metabase/static-viz/components/Gauge/Gauge.tsx@@ -106,7 +106,10 @@ export default function Gauge({<Group className="visx-pie-arcs-group">{baseArcPath && (<g>- <path d={baseArcPath} fill={getColor("bg-medium")} />+ <path+ d={baseArcPath}+ fill={getColor("background-tertiary")}+ /></g>)}{pie.arcs.map((arc, index) => {@@ -140,7 +143,7 @@ export default function Gauge({}}</Pie><GaugeNeedle- color={getColor("bg-dark")}+ color={getColor("background-tertiary-inverse")}outlineColor={outlineColor}position={gaugeNeedlePosition}valueAngle={gaugeNeedleAngle}@@ -161,7 +164,7 @@ export default function Gauge({},)}<GaugeLabel- fill={getColor("text-dark")}+ fill={getColor("text-primary")}stroke={outlineColor}fontSize={dynamicValueFontSize}position={[0, -GAUGE_INNER_RADIUS * 0.4]}diff --git a/frontend/src/metabase/static-viz/components/Gauge/GaugeContainer.tsx b/frontend/src/metabase/static-viz/components/Gauge/GaugeContainer.tsxindex 96ef8e8e7c2..ebd75f1a38b 100644--- a/frontend/src/metabase/static-viz/components/Gauge/GaugeContainer.tsx+++ b/frontend/src/metabase/static-viz/components/Gauge/GaugeContainer.tsx@@ -89,7 +89,7 @@ export default function GaugeContainer({],textAnchor: "middle",value: valueFormatter(segmentValue),- color: getColor("text-medium"),+ color: getColor("text-secondary"),};}@@ -101,7 +101,7 @@ export default function GaugeContainer({],textAnchor: "middle",value: valueFormatter(segmentValue),- color: getColor("text-medium"),+ color: getColor("text-secondary"),};}@@ -109,7 +109,7 @@ export default function GaugeContainer({position: calculateSegmentLabelPosition(segmentValueAngle),textAnchor: calculateSegmentLabelTextAnchor(segmentValueAngle),value: valueFormatter(segmentValue),- color: getColor("text-medium"),+ color: getColor("text-secondary"),};});@@ -138,7 +138,7 @@ export default function GaugeContainer({weight: CHAR_SIZES_FONT_WEIGHT,},),- color: getColor("text-dark"),+ color: getColor("text-primary"),};});diff --git a/frontend/src/metabase/static-viz/components/RowChart/theme.ts b/frontend/src/metabase/static-viz/components/RowChart/theme.tsindex cb6c02b48c9..3e4c9a480ca 100644--- a/frontend/src/metabase/static-viz/components/RowChart/theme.ts+++ b/frontend/src/metabase/static-viz/components/RowChart/theme.ts@@ -11,28 +11,28 @@ export const getStaticChartTheme = (ticks: {size: 12,weight: 700,- color: getColor("bg-dark"),+ color: getColor("background-tertiary-inverse"),family: fontFamily,},label: {size: 14,weight: 700,- color: getColor("bg-dark"),+ color: getColor("background-tertiary-inverse"),family: fontFamily,},},goal: {- lineStroke: getColor("text-medium"),+ lineStroke: getColor("text-secondary"),label: {size: 14,weight: 700,- color: getColor("text-medium"),+ color: getColor("text-secondary"),family: fontFamily,},},dataLabels: {weight: 700,- color: getColor("text-dark"),+ color: getColor("text-primary"),size: 12,family: fontFamily,},diff --git a/frontend/src/metabase/static-viz/components/SmartScalar/SmartScalar.tsx b/frontend/src/metabase/static-viz/components/SmartScalar/SmartScalar.tsxindex 43b06a3388b..2c1df0a6f4d 100644--- a/frontend/src/metabase/static-viz/components/SmartScalar/SmartScalar.tsx+++ b/frontend/src/metabase/static-viz/components/SmartScalar/SmartScalar.tsx@@ -38,12 +38,12 @@ export function SmartScalar({fontSize: "14px",},value: {- color: getColor("text-dark"),+ color: getColor("text-primary"),fontSize: "24px",fontWeight: 700,},date: {- color: getColor("text-dark"),+ color: getColor("text-primary"),fontWeight: 700,},comparisonList: {@@ -106,16 +106,16 @@ function Comparison({ comparison, renderingContext }: ComparisonProps) {marginRight: "6px",},percentChange: {- color: comparison.changeColor || getColor("text-light"),+ color: comparison.changeColor || getColor("text-tertiary"),fontWeight: 900,marginRight: 4,},comparisonDescription: {- color: getColor("text-medium"),+ color: getColor("text-secondary"),fontWeight: 700,},comparisonValue: {- color: getColor("text-light"),+ color: getColor("text-tertiary"),fontWeight: 700,},};diff --git a/frontend/src/metabase/status/components/StatusLarge/StatusLarge.styled.tsx b/frontend/src/metabase/status/components/StatusLarge/StatusLarge.styled.tsxindex 9e63d4f72ca..50bc37dc906 100644--- a/frontend/src/metabase/status/components/StatusLarge/StatusLarge.styled.tsx+++ b/frontend/src/metabase/status/components/StatusLarge/StatusLarge.styled.tsx@@ -8,7 +8,7 @@ import { color } from "metabase/ui/utils/colors";export const StatusRoot = styled.div`width: 16rem;border-radius: 6px;- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);box-shadow: 0 1px 12px var(--mb-color-shadow);overflow: hidden;margin-top: 1rem;@@ -25,7 +25,7 @@ export const StatusHeader = styled.div`export const StatusTitle = styled.div`flex: 1 1 auto;width: 100%;- color: var(--mb-color-bg-light);+ color: var(--mb-color-background-secondary);font-size: 0.875rem;font-weight: bold;line-height: 1rem;@@ -33,11 +33,11 @@ export const StatusTitle = styled.div`export const StatusToggle = styled(IconButtonWrapper)`flex: 0 0 auto;- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);`;export const StatusBody = styled.div`- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);`;export const StatusCardRoot = styled.div<{ hasBody?: boolean }>`@@ -65,7 +65,7 @@ export const StatusCardIcon = styled.div``;export const StatusCardTitle = styled.div`- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);font-size: 0.875rem;font-weight: bold;line-height: 1rem;@@ -73,7 +73,7 @@ export const StatusCardTitle = styled.div``;export const StatusCardDescription = styled.div`- color: var(--mb-color-bg-dark);+ color: var(--mb-color-background-tertiary-inverse);font-size: 0.6875rem;font-weight: bold;line-height: 0.8125rem;@@ -99,7 +99,7 @@ export const StatusCardIconContainer = styled.div<StatusCardIconContainerProps>`width: 1.5rem;height: 1.5rem;border-radius: 1rem;- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);background-color: ${(props) =>props.isError ? color("error") : color("success")};`;diff --git a/frontend/src/metabase/status/components/StatusSmall/StatusSmall.styled.tsx b/frontend/src/metabase/status/components/StatusSmall/StatusSmall.styled.tsxindex 0394e2ff6cc..0c60937df7c 100644--- a/frontend/src/metabase/status/components/StatusSmall/StatusSmall.styled.tsx+++ b/frontend/src/metabase/status/components/StatusSmall/StatusSmall.styled.tsx@@ -16,7 +16,7 @@ const getIconColor = ({ status }: Props): string => {case "incomplete":return color("brand");default:- return color("text-white");+ return color("text-primary-inverse");}};diff --git a/frontend/src/metabase/timelines/collections/components/EventCard/EventCard.styled.tsx b/frontend/src/metabase/timelines/collections/components/EventCard/EventCard.styled.tsxindex 069c77c9d3f..ba433371d7b 100644--- a/frontend/src/metabase/timelines/collections/components/EventCard/EventCard.styled.tsx+++ b/frontend/src/metabase/timelines/collections/components/EventCard/EventCard.styled.tsx@@ -57,7 +57,7 @@ const cardTitleHoverStyles = css``;export const CardTitle = styled.div<CardTitleProps>`- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);font-size: 1rem;line-height: 1.25rem;font-weight: bold;@@ -66,7 +66,7 @@ export const CardTitle = styled.div<CardTitleProps>``;export const CardDescription = styled(Markdown)`- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);margin-top: 0.25rem;word-wrap: break-word;`;@@ -79,7 +79,7 @@ export const CardDateInfo = styled.div``;export const CardCreatorInfo = styled.div`- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);margin-top: 0.25rem;font-size: 0.75rem;`;diff --git a/frontend/src/metabase/timelines/collections/components/EventList/EventList.styled.tsx b/frontend/src/metabase/timelines/collections/components/EventList/EventList.styled.tsxindex 3d38bc291e6..c7f321bc9f7 100644--- a/frontend/src/metabase/timelines/collections/components/EventList/EventList.styled.tsx+++ b/frontend/src/metabase/timelines/collections/components/EventList/EventList.styled.tsx@@ -31,13 +31,13 @@ export const ListThreadContainer = styled.div``;export const ListIcon = styled(Icon)`- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);width: 1.5rem;height: 1.5rem;`;export const ListIconText = styled.div`- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);margin-top: 0.375rem;margin-left: 0.75rem;`;diff --git a/frontend/src/metabase/timelines/collections/components/SearchEmptyState/SearchEmptyState.tsx b/frontend/src/metabase/timelines/collections/components/SearchEmptyState/SearchEmptyState.tsxindex 2bb305c4003..44abce9edf1 100644--- a/frontend/src/metabase/timelines/collections/components/SearchEmptyState/SearchEmptyState.tsx+++ b/frontend/src/metabase/timelines/collections/components/SearchEmptyState/SearchEmptyState.tsx@@ -15,7 +15,7 @@ const SearchEmptyState = ({<Box maw="6rem"><img src={EmptyFolder} alt={t`Empty folder illustration`} /></Box>- <Text fz="md" maw="25rem" c="text-medium">+ <Text fz="md" maw="25rem" c="text-secondary">{isTimeline ? t`No timelines found` : t`No events found`}</Text></Stack>diff --git a/frontend/src/metabase/timelines/collections/components/TimelineCard/TimelineCard.styled.tsx b/frontend/src/metabase/timelines/collections/components/TimelineCard/TimelineCard.styled.tsxindex 8b913d9cca2..8eca2c60f94 100644--- a/frontend/src/metabase/timelines/collections/components/TimelineCard/TimelineCard.styled.tsx+++ b/frontend/src/metabase/timelines/collections/components/TimelineCard/TimelineCard.styled.tsx@@ -8,7 +8,7 @@ import Markdown from "metabase/common/components/Markdown";import { Icon } from "metabase/ui";export const CardIcon = styled(Icon)`- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);width: 1.375rem;height: 1.375rem;`;@@ -22,7 +22,7 @@ export const CardBody = styled.span`export const CardTitle = styled.span`display: block;- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);font-weight: bold;margin-bottom: 0.125rem;word-wrap: break-word;@@ -30,7 +30,7 @@ export const CardTitle = styled.span`export const CardDescription = styled(Markdown)`display: block;- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);word-wrap: break-word;`;@@ -41,7 +41,7 @@ interface CardCountProps {export const CardCount = styled.span<CardCountProps>`display: block;flex: 0 0 auto;- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);align-self: ${(props) => (props.isTopAligned ? "flex-start" : "")};`;diff --git a/frontend/src/metabase/timelines/common/components/ModalHeader/ModalHeader.styled.tsx b/frontend/src/metabase/timelines/common/components/ModalHeader/ModalHeader.styled.tsxindex 6b760894723..d2a0ba30901 100644--- a/frontend/src/metabase/timelines/common/components/ModalHeader/ModalHeader.styled.tsx+++ b/frontend/src/metabase/timelines/common/components/ModalHeader/ModalHeader.styled.tsx@@ -11,7 +11,7 @@ export const HeaderLink = styled.div`align-items: center;min-width: 0;margin-right: auto;- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);cursor: ${(props) => props.onClick && "pointer"};&:hover {@@ -42,5 +42,5 @@ export const HeaderCloseButton = styled(IconButtonWrapper)`height: 36px;width: 36px;flex: 0 0 auto;- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);`;diff --git a/frontend/src/metabase/timelines/common/components/ModalHeader/ModalHeader.tsx b/frontend/src/metabase/timelines/common/components/ModalHeader/ModalHeader.tsxindex 97c7e1a73e2..d29ba3caa20 100644--- a/frontend/src/metabase/timelines/common/components/ModalHeader/ModalHeader.tsx+++ b/frontend/src/metabase/timelines/common/components/ModalHeader/ModalHeader.tsx@@ -46,7 +46,7 @@ const ModalHeader = ({{pathOptions?.showPath && (<Group gap="xs" align="center">{c("Refers to: 'Events' in a collection").t`in`}- <Icon name="folder" c="text-light" />+ <Icon name="folder" c="text-tertiary" />{pathOptions.collectionName}</Group>)}diff --git a/frontend/src/metabase/timelines/common/components/TimelinePicker/TimelinePicker.styled.tsx b/frontend/src/metabase/timelines/common/components/TimelinePicker/TimelinePicker.styled.tsxindex 95fec8709b1..0e88b78dfd4 100644--- a/frontend/src/metabase/timelines/common/components/TimelinePicker/TimelinePicker.styled.tsx+++ b/frontend/src/metabase/timelines/common/components/TimelinePicker/TimelinePicker.styled.tsx@@ -16,7 +16,7 @@ export const CardBody = styled.div``;export const CardTitle = styled.div`- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);font-size: 1rem;font-weight: bold;margin-bottom: 0.125rem;@@ -24,13 +24,13 @@ export const CardTitle = styled.div``;export const CardDescription = styled.div`- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);font-size: 0.75rem;word-wrap: break-word;`;export const CardIcon = styled(Icon)`- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);width: 1rem;height: 1rem;`;@@ -48,7 +48,7 @@ export const CardIconContainer = styled.div`export const CardAside = styled.div`flex: 0 0 auto;- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);font-size: 0.75rem;`;@@ -60,7 +60,7 @@ const selectedStyles = css`background-color: var(--mb-color-brand);${CardTitle}, ${CardDescription}, ${CardAside} {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);}${CardIcon} {@@ -68,8 +68,8 @@ const selectedStyles = css`}${CardIconContainer} {- border-color: var(--mb-color-bg-white);- background-color: var(--mb-color-bg-white);+ border-color: var(--mb-color-background-primary);+ background-color: var(--mb-color-background-primary);}`;diff --git a/frontend/src/metabase/timelines/questions/components/EventCard/EventCard.styled.tsx b/frontend/src/metabase/timelines/questions/components/EventCard/EventCard.styled.tsxindex 9c2b712f630..19735dc91a3 100644--- a/frontend/src/metabase/timelines/questions/components/EventCard/EventCard.styled.tsx+++ b/frontend/src/metabase/timelines/questions/components/EventCard/EventCard.styled.tsx@@ -49,7 +49,7 @@ export const CardBody = styled.div``;export const CardTitle = styled.div`- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);font-size: 1rem;line-height: 1.25rem;font-weight: bold;@@ -57,7 +57,7 @@ export const CardTitle = styled.div``;export const CardDescription = styled(Markdown)`- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);margin-top: 0.25rem;word-wrap: break-word;`;@@ -69,7 +69,7 @@ export const CardDateInfo = styled.div``;export const CardCreatorInfo = styled.div`- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);margin-top: 0.25rem;font-size: 0.75rem;`;diff --git a/frontend/src/metabase/timelines/questions/components/TimelineCard/TimelineCard.styled.tsx b/frontend/src/metabase/timelines/questions/components/TimelineCard/TimelineCard.styled.tsxindex d4defdb8850..3c1104498f9 100644--- a/frontend/src/metabase/timelines/questions/components/TimelineCard/TimelineCard.styled.tsx+++ b/frontend/src/metabase/timelines/questions/components/TimelineCard/TimelineCard.styled.tsx@@ -23,14 +23,14 @@ export const CardCheckbox = styled(CheckBox)`export const CardLabel = styled.span`flex: 1 1 auto;margin: 0 0.5rem;- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);font-weight: bold;font-size: 0.875rem;min-width: 0;`;export const CardIcon = styled(Icon)`- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);width: 1.125rem;height: 1.125rem;`;diff --git a/frontend/src/metabase/ui/components/buttons/ActionIcon/ActionIcon.module.css b/frontend/src/metabase/ui/components/buttons/ActionIcon/ActionIcon.module.cssindex 5ff55e32f33..69b2490ce75 100644--- a/frontend/src/metabase/ui/components/buttons/ActionIcon/ActionIcon.module.css+++ b/frontend/src/metabase/ui/components/buttons/ActionIcon/ActionIcon.module.css@@ -1,6 +1,6 @@.root {&[data-disabled] {- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);pointer-events: all;}@@ -9,31 +9,31 @@&:hover {color: var(--mb-color-text-secondary);- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);}}&[data-variant="viewHeader"] {- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);background-color: transparent;border: 1px solid transparent;transition: all 300ms linear;&:hover {color: var(--mb-color-brand);- background-color: var(--mb-color-bg-medium);+ background-color: var(--mb-color-background-tertiary);border: 1px solid transparent;}&:disabled,&[data-disabled] {- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);background-color: transparent;}}&[data-variant="viewFooter"] {- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);background-color: transparent;&:hover {@@ -42,7 +42,7 @@&:disabled,&[data-disabled] {- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);background-color: transparent;}}diff --git a/frontend/src/metabase/ui/components/buttons/Button/Button.module.css b/frontend/src/metabase/ui/components/buttons/Button/Button.module.cssindex e02848d6da4..ceb7644f7c3 100644--- a/frontend/src/metabase/ui/components/buttons/Button/Button.module.css+++ b/frontend/src/metabase/ui/components/buttons/Button/Button.module.css@@ -46,7 +46,7 @@&[data-variant="default"] {color: var(--mb-color-text-primary);border-color: var(--mb-color-border);- background-color: var(--mb-color-background);+ background-color: var(--mb-color-background-primary);&[aria-pressed="true"],&:hover {@@ -56,7 +56,7 @@}&[data-variant="filled"] {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);&:hover {border-color: alpha(var(--button-bg), 0.88);@@ -72,12 +72,12 @@&:disabled,&[data-disabled="true"] {- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);border-color: transparent;background-color: transparent;&:hover {- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);border-color: transparent;background-color: transparent;}@@ -91,7 +91,7 @@border-radius: 8px;display: flex;justify-content: flex-start;- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);font-weight: 500;background-color: transparent;padding: rem(4px) rem(15px);@@ -106,7 +106,7 @@}&[aria-pressed="true"] {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);background-color: var(--button-color);}@@ -127,7 +127,7 @@display: flex;justify-content: flex-start;- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);background-color: transparent;&:hover {@@ -145,12 +145,12 @@&:disabled,&[data-disabled="true"] {- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);border-color: transparent;background-color: transparent;&:hover {- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);border-color: transparent;background-color: transparent;}diff --git a/frontend/src/metabase/ui/components/buttons/PopoverBackButton/PopoverBackButton.tsx b/frontend/src/metabase/ui/components/buttons/PopoverBackButton/PopoverBackButton.tsxindex 0e9583a2921..65cfa4432a8 100644--- a/frontend/src/metabase/ui/components/buttons/PopoverBackButton/PopoverBackButton.tsx+++ b/frontend/src/metabase/ui/components/buttons/PopoverBackButton/PopoverBackButton.tsx@@ -7,7 +7,7 @@ import type { BoxProps } from "../../utils";import { Button } from "../Button";export type PopoverBackButtonProps = { withArrow?: boolean } & BoxProps &- ButtonHTMLAttributes<HTMLButtonElement>;+ Omit<ButtonHTMLAttributes<HTMLButtonElement>, "color">;export function PopoverBackButton(props: PopoverBackButtonProps) {const { withArrow = true, ...rest } = props;@@ -15,7 +15,7 @@ export function PopoverBackButton(props: PopoverBackButtonProps) {<Buttonp={0}aria-label={t`Back`}- c="var(--mb-color-text-primary)"+ c="text-primary"fz="1rem"lh="1.25rem"{...rest}diff --git a/frontend/src/metabase/ui/components/data-display/Accordion/Accordion.module.css b/frontend/src/metabase/ui/components/data-display/Accordion/Accordion.module.cssindex 4f07328c31b..dd0b767cd83 100644--- a/frontend/src/metabase/ui/components/data-display/Accordion/Accordion.module.css+++ b/frontend/src/metabase/ui/components/data-display/Accordion/Accordion.module.css@@ -31,11 +31,11 @@.content {border-top: 1px solid var(--mb-color-border);- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);}.chevron {- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);border: 1px solid var(--mb-color-border);border-radius: 100%;margin-left: 1rem;diff --git a/frontend/src/metabase/ui/components/data-display/Avatar/Avatar.config.ts b/frontend/src/metabase/ui/components/data-display/Avatar/Avatar.config.tsindex 51dfac92af6..4b9c2b179dc 100644--- a/frontend/src/metabase/ui/components/data-display/Avatar/Avatar.config.ts+++ b/frontend/src/metabase/ui/components/data-display/Avatar/Avatar.config.ts@@ -1,17 +1,17 @@import { Avatar, rem } from "@mantine/core";-import { color } from "metabase/ui/utils/colors";+import type { ColorName } from "metabase/lib/colors/types";-const avatarColors = [- "var(--mb-color-brand)",- "var(--mb-color-error)",- color("accent1"),- color("accent2"),- color("accent3"),- color("accent4"),- color("accent5"),- color("accent6"),- color("accent7"),+const avatarColors: ColorName[] = [+ "brand",+ "error",+ "accent1",+ "accent2",+ "accent3",+ "accent4",+ "accent5",+ "accent6",+ "accent7",];export const avatarOverrides = {diff --git a/frontend/src/metabase/ui/components/data-display/Card/Card.stories.tsx b/frontend/src/metabase/ui/components/data-display/Card/Card.stories.tsxindex 5cd882636bd..d2692a2f6e0 100644--- a/frontend/src/metabase/ui/components/data-display/Card/Card.stories.tsx+++ b/frontend/src/metabase/ui/components/data-display/Card/Card.stories.tsx@@ -44,7 +44,7 @@ const CardSectionTemplate = ({<Box maw="20rem"><Card {...args}><Card.Section withBorder={withSectionBorder}>- <Box bg="bg" h="10rem" />+ <Box bg="background-primary" h="10rem" /></Card.Section><Stack mt="md" gap="sm"><Text fw="bold">{sampleArgs.title}</Text>diff --git a/frontend/src/metabase/ui/components/data-display/Kbd/Kbd.module.css b/frontend/src/metabase/ui/components/data-display/Kbd/Kbd.module.cssindex 36e868c285a..50c03672fec 100644--- a/frontend/src/metabase/ui/components/data-display/Kbd/Kbd.module.css+++ b/frontend/src/metabase/ui/components/data-display/Kbd/Kbd.module.css@@ -1,5 +1,5 @@.root {- background-color: var(--mb-color-background);+ background-color: var(--mb-color-background-primary);border-color: var(--mb-color-border);color: var(--mb-color-text-primary);border-bottom-width: 1px;diff --git a/frontend/src/metabase/ui/components/data-display/TreeTable/EntityNameCell/EntityNameCell.tsx b/frontend/src/metabase/ui/components/data-display/TreeTable/EntityNameCell/EntityNameCell.tsxindex 5d0a5710830..1faa730802a 100644--- a/frontend/src/metabase/ui/components/data-display/TreeTable/EntityNameCell/EntityNameCell.tsx+++ b/frontend/src/metabase/ui/components/data-display/TreeTable/EntityNameCell/EntityNameCell.tsx@@ -2,13 +2,14 @@ import { memo } from "react";import { Ellipsified } from "metabase/common/components/Ellipsified";import CS from "metabase/css/core/index.css";+import type { ColorName } from "metabase/lib/colors/types";import type { IconName } from "metabase/ui";import { Group, Icon, Text } from "metabase/ui";interface EntityNameCellProps {icon?: IconName;name: string;- iconColor?: string;+ iconColor?: ColorName;wrap?: boolean;tooltipOpenDelay?: number;"data-testid"?: string;diff --git a/frontend/src/metabase/ui/components/data-display/TreeTable/TreeTable.stories.tsx b/frontend/src/metabase/ui/components/data-display/TreeTable/TreeTable.stories.tsxindex 80b4ca00e5c..c8a668b77d0 100644--- a/frontend/src/metabase/ui/components/data-display/TreeTable/TreeTable.stories.tsx+++ b/frontend/src/metabase/ui/components/data-display/TreeTable/TreeTable.stories.tsx@@ -131,7 +131,7 @@ const detailedColumns: TreeTableColumnDef<CollectionItem>[] = [header: "Type",width: 100,cell: ({ row }) => (- <Text c="text-medium" size="sm" tt="capitalize">+ <Text c="text-secondary" size="sm" tt="capitalize">{row.original.type}</Text>),@@ -142,7 +142,7 @@ const detailedColumns: TreeTableColumnDef<CollectionItem>[] = [width: 140,cell: ({ row }) =>row.original.owner ? (- <Text c="text-medium" size="sm">+ <Text c="text-secondary" size="sm">{row.original.owner}</Text>) : null,@@ -153,7 +153,7 @@ const detailedColumns: TreeTableColumnDef<CollectionItem>[] = [width: 120,cell: ({ row }) =>row.original.lastEdited ? (- <Text c="text-medium" size="sm">+ <Text c="text-secondary" size="sm">{row.original.lastEdited}</Text>) : null,@@ -258,8 +258,8 @@ export const EmptyState = {instance={instance}emptyState={<Box ta="center" py="xl">- <Icon name="folder" size={48} c="text-light" />- <Text c="text-medium" mt="md">+ <Icon name="folder" size={48} c="text-tertiary" />+ <Text c="text-secondary" mt="md">This collection is empty</Text></Box>diff --git a/frontend/src/metabase/ui/components/data-display/TreeTable/TreeTable.tsx b/frontend/src/metabase/ui/components/data-display/TreeTable/TreeTable.tsxindex cdc787031e6..c8c4099f6a5 100644--- a/frontend/src/metabase/ui/components/data-display/TreeTable/TreeTable.tsx+++ b/frontend/src/metabase/ui/components/data-display/TreeTable/TreeTable.tsx@@ -141,7 +141,7 @@ export function TreeTable<TData extends TreeNodeData>({style={styles?.body}>{showEmptyState ? (- <Center h="100%" p="xl" c="text-light">+ <Center h="100%" p="xl" c="text-tertiary">{emptyState}</Center>) : (diff --git a/frontend/src/metabase/ui/components/data-display/TreeTable/TreeTableHeader/HeaderCell/HeaderCell.tsx b/frontend/src/metabase/ui/components/data-display/TreeTable/TreeTableHeader/HeaderCell/HeaderCell.tsxindex a0bf2df5623..e13e79a6090 100644--- a/frontend/src/metabase/ui/components/data-display/TreeTable/TreeTableHeader/HeaderCell/HeaderCell.tsx+++ b/frontend/src/metabase/ui/components/data-display/TreeTable/TreeTableHeader/HeaderCell/HeaderCell.tsx@@ -26,7 +26,7 @@ export const HeaderCell = memo(function HeaderCell({gap="0.25rem"fz="0.75rem"fw={700}- c="text-medium"+ c="text-secondary">{name}{sort && (diff --git a/frontend/src/metabase/ui/components/data-display/TreeTable/TreeTableHeader/TreeTableHeader.module.css b/frontend/src/metabase/ui/components/data-display/TreeTable/TreeTableHeader/TreeTableHeader.module.cssindex ba1aab7d442..868833ac3b4 100644--- a/frontend/src/metabase/ui/components/data-display/TreeTable/TreeTableHeader/TreeTableHeader.module.css+++ b/frontend/src/metabase/ui/components/data-display/TreeTable/TreeTableHeader/TreeTableHeader.module.css@@ -6,7 +6,7 @@z-index: 1;flex-shrink: 0;font-size: 12.5px;- background-color: var(--mb-color-background);+ background-color: var(--mb-color-background-primary);border-bottom: 1px solid var(--mb-color-border);}diff --git a/frontend/src/metabase/ui/components/data-display/TreeTable/TreeTableRow/TreeTableRow.tsx b/frontend/src/metabase/ui/components/data-display/TreeTable/TreeTableRow/TreeTableRow.tsxindex 6e789ea2889..3a0f4472e32 100644--- a/frontend/src/metabase/ui/components/data-display/TreeTable/TreeTableRow/TreeTableRow.tsx+++ b/frontend/src/metabase/ui/components/data-display/TreeTable/TreeTableRow/TreeTableRow.tsx@@ -97,7 +97,7 @@ const TreeTableRowContent = memo(function TreeTableRowContent<h={DEFAULT_ROW_HEIGHT}fz="0.875rem"lh="1.25rem"- c="text-dark"+ c="text-primary"style={styles?.row}aria-expanded={canExpand ? isExpanded : undefined}aria-selected={isSelected}diff --git a/frontend/src/metabase/ui/components/data-display/TreeTable/TreeTableSkeleton/TreeTableSkeleton.module.css b/frontend/src/metabase/ui/components/data-display/TreeTable/TreeTableSkeleton/TreeTableSkeleton.module.cssindex 6536ed04247..36826f23022 100644--- a/frontend/src/metabase/ui/components/data-display/TreeTable/TreeTableSkeleton/TreeTableSkeleton.module.css+++ b/frontend/src/metabase/ui/components/data-display/TreeTable/TreeTableSkeleton/TreeTableSkeleton.module.css@@ -1,5 +1,5 @@.header {- background-color: var(--mb-color-background);+ background-color: var(--mb-color-background-primary);border-bottom: 1px solid var(--mb-color-border);}diff --git a/frontend/src/metabase/ui/components/feedback/Alert/Alert.module.css b/frontend/src/metabase/ui/components/feedback/Alert/Alert.module.cssindex 617d8bd808d..5848e2b15a1 100644--- a/frontend/src/metabase/ui/components/feedback/Alert/Alert.module.css+++ b/frontend/src/metabase/ui/components/feedback/Alert/Alert.module.css@@ -3,6 +3,6 @@}.title {- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);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.tsxindex 266205c338d..a72de327d40 100644--- a/frontend/src/metabase/ui/components/feedback/Alert/Alert.stories.tsx+++ b/frontend/src/metabase/ui/components/feedback/Alert/Alert.stories.tsx@@ -82,6 +82,14 @@ const multiColor = (args: AlertProps) => {data access for the entire database to Blocked.</Text></Alert>+ <Alert {...args} color="success">+ <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>);};diff --git a/frontend/src/metabase/ui/components/feedback/Alert/index.tsx b/frontend/src/metabase/ui/components/feedback/Alert/index.tsxindex ad07332ec76..f568bd960e3 100644--- a/frontend/src/metabase/ui/components/feedback/Alert/index.tsx+++ b/frontend/src/metabase/ui/components/feedback/Alert/index.tsx@@ -5,7 +5,7 @@ import {export { alertOverrides } from "./Alert.config";export type AlertProps = MantineAlertProps & {- color?: "brand" | "warning" | "error" | "info";+ color?: "brand" | "warning" | "error" | "info" | "success";};export const Alert = (props: AlertProps) => <MantineAlert {...props} />;diff --git a/frontend/src/metabase/ui/components/feedback/Loader/Loader.tsx b/frontend/src/metabase/ui/components/feedback/Loader/Loader.tsxindex 84164fa3795..6feb6b8d672 100644--- a/frontend/src/metabase/ui/components/feedback/Loader/Loader.tsx+++ b/frontend/src/metabase/ui/components/feedback/Loader/Loader.tsx@@ -30,7 +30,7 @@ export const Loader = ({ size = "md", label, ...props }: LoaderProps) => {return label ? (<Stack justify="center" align="center" gap="sm" mt="xl"><MantineLoader {...props} size={getSize(SIZES[size])} />- <Text c="text-light" size="xl">+ <Text c="text-tertiary" size="xl">{label}</Text></Stack>diff --git a/frontend/src/metabase/ui/components/feedback/Skeleton/Skeleton.module.css b/frontend/src/metabase/ui/components/feedback/Skeleton/Skeleton.module.cssindex 4a7880f6156..e68464ee61e 100644--- a/frontend/src/metabase/ui/components/feedback/Skeleton/Skeleton.module.css+++ b/frontend/src/metabase/ui/components/feedback/Skeleton/Skeleton.module.css@@ -5,7 +5,7 @@background: linear-gradient(100deg,transparent,- var(--mb-color-bg-medium),+ var(--mb-color-background-tertiary),transparent);animation: shimmer 1.4s linear infinite;diff --git a/frontend/src/metabase/ui/components/icons/Icon/Icon.tsx b/frontend/src/metabase/ui/components/icons/Icon/Icon.tsxindex c4c6ff6fa04..202535c8bfc 100644--- a/frontend/src/metabase/ui/components/icons/Icon/Icon.tsx+++ b/frontend/src/metabase/ui/components/icons/Icon/Icon.tsx@@ -5,6 +5,8 @@ import cx from "classnames";import type { MouseEvent, ReactNode, SVGAttributes } from "react";import { forwardRef } from "react";+import type { ColorName } from "metabase/lib/colors/types";+import { Tooltip } from "../../overlays/Tooltip";import type { IconName } from "./icons";@@ -12,7 +14,7 @@ import { Icons } from "./icons";const defaultSize = 16;-export type IconProps = SVGAttributes<SVGSVGElement> &+export type IconProps = Omit<SVGAttributes<SVGSVGElement>, "color"> &BoxProps & {name: IconName;size?: string | number;@@ -20,6 +22,7 @@ export type IconProps = SVGAttributes<SVGSVGElement> &tooltipPosition?: FloatingPosition;onClick?: (event: MouseEvent<HTMLImageElement | SVGElement>) => void;className?: string;+ color?: ColorName | string;};export const Icon = forwardRef<SVGSVGElement, IconProps>(function Icon(diff --git a/frontend/src/metabase/ui/components/inputs/Calendar/Calendar.module.css b/frontend/src/metabase/ui/components/inputs/Calendar/Calendar.module.cssindex 75890a60a9e..cb799f4f045 100644--- a/frontend/src/metabase/ui/components/inputs/Calendar/Calendar.module.css+++ b/frontend/src/metabase/ui/components/inputs/Calendar/Calendar.module.css@@ -11,7 +11,7 @@}&[data-disabled] {- color: var(--mb-color-bg-dark);+ color: var(--mb-color-background-tertiary-inverse);}&[data-weekend] {@@ -19,7 +19,7 @@}&[data-outside] {- color: var(--mb-color-bg-dark);+ color: var(--mb-color-background-tertiary-inverse);}&[data-in-range] {@@ -43,7 +43,7 @@}&[data-selected] {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);background-color: var(--mb-color-brand);&:hover {@@ -55,7 +55,7 @@.weekday {width: 2.5rem;height: 2rem;- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);font-size: var(--mantine-font-size-sm);line-height: var(--mantine-line-height-lg);text-align: center;@@ -77,15 +77,15 @@}&[data-disabled] {- color: var(--mb-color-bg-dark);+ color: var(--mb-color-background-tertiary-inverse);}&:where([data-weekend]) {- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);}&[data-outside] {- color: var(--mb-color-bg-dark);+ color: var(--mb-color-background-tertiary-inverse);}&[data-in-range] {@@ -210,7 +210,7 @@.input {color: var(--mb-color-text-primary);- background-color: var(--mb-color-background);+ background-color: var(--mb-color-background-primary);}.error {diff --git a/frontend/src/metabase/ui/components/inputs/Checkbox/Checkbox.module.css b/frontend/src/metabase/ui/components/inputs/Checkbox/Checkbox.module.cssindex 6c041235199..56ba621ca48 100644--- a/frontend/src/metabase/ui/components/inputs/Checkbox/Checkbox.module.css+++ b/frontend/src/metabase/ui/components/inputs/Checkbox/Checkbox.module.css@@ -32,7 +32,7 @@&[data-indeterminate],&[data-indeterminate="true"] {border-color: var(--mb-color-border);- background-color: var(--mb-color-background);+ background-color: var(--mb-color-background-primary);}&:after {@@ -45,7 +45,7 @@width: 100%;border-radius: var(--checkbox-radius);z-index: -1;- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);box-sizing: "border-box";}@@ -67,7 +67,7 @@.input {cursor: pointer;border: 1px solid var(--mb-color-border);- background-color: var(--mb-color-background);+ background-color: var(--mb-color-background-primary);/* Mantine compatibility: supports old and new data-indeterminate. See: https://github.com/mantinedev/mantine/pull/8385 */&[data-indeterminate],@@ -103,5 +103,5 @@}.icon {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);}diff --git a/frontend/src/metabase/ui/components/inputs/Chip/Chip.module.css b/frontend/src/metabase/ui/components/inputs/Chip/Chip.module.cssindex 51bc20d2aad..ce685371df9 100644--- a/frontend/src/metabase/ui/components/inputs/Chip/Chip.module.css+++ b/frontend/src/metabase/ui/components/inputs/Chip/Chip.module.css@@ -9,7 +9,7 @@&[data-checked="true"] {padding-inline: 1rem;background-color: var(--mb-color-brand);- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);}}diff --git a/frontend/src/metabase/ui/components/inputs/Combobox/Combobox.module.css b/frontend/src/metabase/ui/components/inputs/Combobox/Combobox.module.cssindex da83e8bcf4a..87bde232c3b 100644--- a/frontend/src/metabase/ui/components/inputs/Combobox/Combobox.module.css+++ b/frontend/src/metabase/ui/components/inputs/Combobox/Combobox.module.css@@ -13,7 +13,7 @@}.empty {- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);font-size: 0.875rem;padding: 1.5rem 0.5rem;}diff --git a/frontend/src/metabase/ui/components/inputs/DatePicker/DatePicker.stories.tsx b/frontend/src/metabase/ui/components/inputs/DatePicker/DatePicker.stories.tsxindex 771f141a65b..f58f4304e9a 100644--- a/frontend/src/metabase/ui/components/inputs/DatePicker/DatePicker.stories.tsx+++ b/frontend/src/metabase/ui/components/inputs/DatePicker/DatePicker.stories.tsx@@ -86,7 +86,7 @@ export const DatesRange = {export const DatesRangeSdk = {render: () => (<SdkVisualizationWrapper theme={theme}>- <Box bg="background">+ <Box bg="background-primary"><DatePicker {...DatesRange.args} /></Box></SdkVisualizationWrapper>diff --git a/frontend/src/metabase/ui/components/inputs/Input/Input.module.css b/frontend/src/metabase/ui/components/inputs/Input/Input.module.cssindex 87b1a36f473..e7cf8b9acc9 100644--- a/frontend/src/metabase/ui/components/inputs/Input/Input.module.css+++ b/frontend/src/metabase/ui/components/inputs/Input/Input.module.css@@ -10,15 +10,15 @@display: block;color: var(--mb-color-text-primary);border-radius: var(--mantine-radius-xs);- background-color: var(--mb-color-background);+ background-color: var(--mb-color-background-primary);&::placeholder {- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);}&:disabled {background-color: var(--mb-color-background-disabled);- color: var(--mb-color-text-disabled);+ color: var(--mb-color-text-tertiary);}&[data-size="xs"] {@@ -54,11 +54,11 @@}.section {- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);}.label {- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);font-size: var(--mantine-font-size-md);font-weight: bold;line-height: var(--mantine-line-height-md);@@ -66,7 +66,7 @@}.description {- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);font-size: var(--mantine-font-size-sm);line-height: var(--mantine-line-height-sm);margin-bottom: var(--mantine-spacing-sm);diff --git a/frontend/src/metabase/ui/components/inputs/MultiAutocomplete/MultiAutocomplete.tsx b/frontend/src/metabase/ui/components/inputs/MultiAutocomplete/MultiAutocomplete.tsxindex 79b2496de5b..ec192ae9323 100644--- a/frontend/src/metabase/ui/components/inputs/MultiAutocomplete/MultiAutocomplete.tsx+++ b/frontend/src/metabase/ui/components/inputs/MultiAutocomplete/MultiAutocomplete.tsx@@ -159,7 +159,7 @@ export function MultiAutocomplete({</Text>}>- <Icon c="text-light" name="info" />+ <Icon c="text-tertiary" name="info" /></Tooltip>);diff --git a/frontend/src/metabase/ui/components/inputs/MultiSelect/MultiSelect.config.tsx b/frontend/src/metabase/ui/components/inputs/MultiSelect/MultiSelect.config.tsxindex 597ad19e3ec..696f758cb27 100644--- a/frontend/src/metabase/ui/components/inputs/MultiSelect/MultiSelect.config.tsx+++ b/frontend/src/metabase/ui/components/inputs/MultiSelect/MultiSelect.config.tsx@@ -21,7 +21,7 @@ export const multiSelectOverrides = {keepMounted: false,},clearButtonProps: {- color: "text-dark",+ color: "text-primary",},"data-testid": "multi-select",inputWrapperOrder: ["label", "description", "input", "error"],diff --git a/frontend/src/metabase/ui/components/inputs/MultiSelect/MultiSelect.module.css b/frontend/src/metabase/ui/components/inputs/MultiSelect/MultiSelect.module.cssindex d0a742f64c9..f4bceb964a0 100644--- a/frontend/src/metabase/ui/components/inputs/MultiSelect/MultiSelect.module.css+++ b/frontend/src/metabase/ui/components/inputs/MultiSelect/MultiSelect.module.css@@ -1,7 +1,7 @@/* this is the wrapper element that looks like an input */.MultiSelectInput {color: var(--mb-color-text-primary);- background-color: var(--mb-color-background);+ background-color: var(--mb-color-background-primary);padding-top: rem(5px);padding-bottom: rem(5px);padding-inline-start: rem(5px);diff --git a/frontend/src/metabase/ui/components/inputs/NumberInput/NumberInput.module.css b/frontend/src/metabase/ui/components/inputs/NumberInput/NumberInput.module.cssindex afd97de51e1..b6224757422 100644--- a/frontend/src/metabase/ui/components/inputs/NumberInput/NumberInput.module.css+++ b/frontend/src/metabase/ui/components/inputs/NumberInput/NumberInput.module.css@@ -1,6 +1,6 @@.input {color: var(--mb-color-text-primary);- background: var(--mb-color-background);+ background: var(--mb-color-background-primary);border-color: var(--mb-color-border);}diff --git a/frontend/src/metabase/ui/components/inputs/Radio/Radio.module.css b/frontend/src/metabase/ui/components/inputs/Radio/Radio.module.cssindex b5a5239e3de..e0015ab1e28 100644--- a/frontend/src/metabase/ui/components/inputs/Radio/Radio.module.css+++ b/frontend/src/metabase/ui/components/inputs/Radio/Radio.module.css@@ -1,15 +1,15 @@.root {&:has(.radio:disabled) {.label {- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);}.description {- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);}.icon {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);}}@@ -21,7 +21,7 @@.radio {cursor: pointer;- border-color: var(--mb-color-text-light);+ border-color: var(--mb-color-text-tertiary);&:checked {border-color: var(--mb-color-brand);@@ -33,13 +33,13 @@}&:disabled:not(:checked) {- border-color: var(--mb-color-text-light);- background-color: var(--mb-color-bg-medium);+ border-color: var(--mb-color-text-tertiary);+ background-color: var(--mb-color-background-tertiary);}}.label {- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);font-size: var(--mantine-font-size-md);line-height: var(--mantine-line-height-md);}@@ -50,7 +50,7 @@}.description {- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);font-size: var(--mantine-font-size-sm);line-height: var(--mantine-line-height-md);margin-top: var(--mantine-spacing-xs);diff --git a/frontend/src/metabase/ui/components/inputs/SegmentedControl/SegmentedControl.config.ts b/frontend/src/metabase/ui/components/inputs/SegmentedControl/SegmentedControl.config.tsindex eaf9833221f..f606461030d 100644--- a/frontend/src/metabase/ui/components/inputs/SegmentedControl/SegmentedControl.config.ts+++ b/frontend/src/metabase/ui/components/inputs/SegmentedControl/SegmentedControl.config.ts@@ -22,10 +22,11 @@ export const segmentedControlOverrides: MantineThemeOverride["components"] = {},vars: (theme, props) => ({root: {- "--sc-active-text-color": props.c ?? "var(--mb-color-text-dark)",- "--sc-background-color": props.bg ?? "var(--mb-color-bg-medium)",+ "--sc-active-text-color": props.c ?? "var(--mb-color-text-primary)",+ "--sc-background-color":+ props.bg ?? "var(--mb-color-background-tertiary)",...(!props.color && {- "--sc-color": "var(--mb-color-bg-white)",+ "--sc-color": "var(--mb-color-background-primary)",}),"--sc-padding": getPadding(theme, props),"--sc-font-size": theme.fontSizes.md,diff --git a/frontend/src/metabase/ui/components/inputs/SegmentedControl/SegmentedControl.module.css b/frontend/src/metabase/ui/components/inputs/SegmentedControl/SegmentedControl.module.cssindex 84280267bf0..c35b590fcb4 100644--- a/frontend/src/metabase/ui/components/inputs/SegmentedControl/SegmentedControl.module.css+++ b/frontend/src/metabase/ui/components/inputs/SegmentedControl/SegmentedControl.module.css@@ -3,7 +3,7 @@}.SegmentedControlLabel {- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);line-height: 1;&:hover {@@ -13,7 +13,7 @@&[data-disabled] {&,&:hover {- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);}}@@ -35,7 +35,7 @@&:disabled + label {&,&:hover {- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);}}}diff --git a/frontend/src/metabase/ui/components/inputs/SegmentedControl/SegmentedControl.stories.tsx b/frontend/src/metabase/ui/components/inputs/SegmentedControl/SegmentedControl.stories.tsxindex acfbde0a4c2..1566c284871 100644--- a/frontend/src/metabase/ui/components/inputs/SegmentedControl/SegmentedControl.stories.tsx+++ b/frontend/src/metabase/ui/components/inputs/SegmentedControl/SegmentedControl.stories.tsx@@ -71,6 +71,6 @@ export const Color = {},],color: "brand",- c: "var(--mb-color-text-white)",+ c: "var(--mb-color-text-primary-inverse)",},};diff --git a/frontend/src/metabase/ui/components/inputs/Select/Select.config.tsx b/frontend/src/metabase/ui/components/inputs/Select/Select.config.tsxindex b4ff12d4ee1..866130341d1 100644--- a/frontend/src/metabase/ui/components/inputs/Select/Select.config.tsx+++ b/frontend/src/metabase/ui/components/inputs/Select/Select.config.tsx@@ -17,7 +17,7 @@ export const selectOverrides = {clearButtonProps: {// eslint-disable-next-line ttag/no-module-declaration"aria-label": t`Clear`,- color: "text-dark",+ color: "text-primary",className: S.SelectClearButton,},comboboxProps: {diff --git a/frontend/src/metabase/ui/components/inputs/Select/Select.module.css b/frontend/src/metabase/ui/components/inputs/Select/Select.module.cssindex 576d5ee73c3..3e1073e5936 100644--- a/frontend/src/metabase/ui/components/inputs/Select/Select.module.css+++ b/frontend/src/metabase/ui/components/inputs/Select/Select.module.css@@ -8,7 +8,7 @@}.SelectWrapper {- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);&[data-disabled] {opacity: 1;@@ -38,19 +38,19 @@.SelectInput {color: var(--mb-color-text-primary);- background-color: var(--mb-color-background);+ background-color: var(--mb-color-background-primary);&[data-disabled] {opacity: 1;- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);}&::placeholder {- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);}[data-position="right"] {- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);}/*@@ -79,11 +79,11 @@[data-disabled] & {opacity: 1;- color: var(--mb-color-text-light);- background-color: var(--mb-color-bg-medium);+ color: var(--mb-color-text-tertiary);+ background-color: var(--mb-color-background-tertiary);&::placeholder {- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);}}}@@ -108,7 +108,7 @@&[data-combobox-disabled] {cursor: default;- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);pointer-events: none;opacity: 0.75;}@@ -137,7 +137,7 @@}.SelectItemsNothingFound {- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);padding: var(--mantine-spacing-sm);font-size: var(--select-item-font-size);line-height: var(--select-item-line-height);@@ -153,7 +153,7 @@}.Dropdown {- background-color: var(--mb-color-background);+ background-color: var(--mb-color-background-primary);border-color: var(--mb-color-border);}@@ -164,5 +164,5 @@}.SelectClearButton {- color: var(--mb-color-text-dark) !important;+ color: var(--mb-color-text-primary) !important;}diff --git a/frontend/src/metabase/ui/components/inputs/Switch/Switch.module.css b/frontend/src/metabase/ui/components/inputs/Switch/Switch.module.cssindex 89e46d10560..8b446bd19f6 100644--- a/frontend/src/metabase/ui/components/inputs/Switch/Switch.module.css+++ b/frontend/src/metabase/ui/components/inputs/Switch/Switch.module.css@@ -9,11 +9,11 @@&[data-disabled] {.track {- background-color: var(--mb-color-bg-medium);+ background-color: var(--mb-color-background-tertiary);}.thumb {- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);}}@@ -41,12 +41,12 @@&[data-disabled] {.label {- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);cursor: default;}.description {- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);}}}@@ -62,7 +62,7 @@padding: 0;margin-top: 0.5rem;font-size: 0.75rem;- color: var(--mb-bolor-text-medium);+ color: var(--mb-color-text-secondary);line-height: 1rem;}@@ -70,7 +70,7 @@padding: 0;margin-top: 0.5rem;font-size: 0.75rem;- color: var(--mb-bolor-text-error);+ color: var(--mb-color-error);}.track {@@ -81,7 +81,7 @@background-color: var(--mb-color-switch-off);input:not(:checked) + & {- background-color: var(--mb-color-bg-medium);+ background-color: var(--mb-color-background-tertiary);}input:checked + & {@@ -89,17 +89,17 @@}input:disabled + & {- background-color: var(--mb-color-bg-medium);+ background-color: var(--mb-color-background-tertiary);}}.thumb {- background-color: var(--mb-color-text-white);+ background-color: var(--mb-color-text-primary-inverse);border: none;border-radius: 1.375rem;input:disabled + * > & {- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);}&::before {diff --git a/frontend/src/metabase/ui/components/inputs/TextInput/TextInput.module.css b/frontend/src/metabase/ui/components/inputs/TextInput/TextInput.module.cssindex afd97de51e1..b6224757422 100644--- a/frontend/src/metabase/ui/components/inputs/TextInput/TextInput.module.css+++ b/frontend/src/metabase/ui/components/inputs/TextInput/TextInput.module.css@@ -1,6 +1,6 @@.input {color: var(--mb-color-text-primary);- background: var(--mb-color-background);+ background: var(--mb-color-background-primary);border-color: var(--mb-color-border);}diff --git a/frontend/src/metabase/ui/components/inputs/TimeInput/TimeInput.module.css b/frontend/src/metabase/ui/components/inputs/TimeInput/TimeInput.module.cssindex 03a6fd81fc7..d5ec7b362c7 100644--- a/frontend/src/metabase/ui/components/inputs/TimeInput/TimeInput.module.css+++ b/frontend/src/metabase/ui/components/inputs/TimeInput/TimeInput.module.css@@ -14,7 +14,7 @@.input {color: var(--mb-color-text-primary);- background-color: var(--mb-color-background);+ background-color: var(--mb-color-background-primary);}.error {diff --git a/frontend/src/metabase/ui/components/navigation/NavLink/NavLink.module.css b/frontend/src/metabase/ui/components/navigation/NavLink/NavLink.module.cssindex 7bb27f61260..716c168a54d 100644--- a/frontend/src/metabase/ui/components/navigation/NavLink/NavLink.module.css+++ b/frontend/src/metabase/ui/components/navigation/NavLink/NavLink.module.css@@ -7,7 +7,7 @@}&[data-active] {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);&,&:hover {@@ -15,11 +15,11 @@}.NavLinkLabel {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);}.NavLinkChevron {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);}}@@ -42,7 +42,7 @@color: var(--mb-color-text-primary);}- background-color: var(--mb-color-bg-medium);+ background-color: var(--mb-color-background-tertiary);}}@@ -79,7 +79,7 @@}.NavLinkChevron {- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);}.NavLinkSection {diff --git a/frontend/src/metabase/ui/components/navigation/Tabs/Tab.module.css b/frontend/src/metabase/ui/components/navigation/Tabs/Tab.module.cssindex 5fa95459c74..0d40e3ab868 100644--- a/frontend/src/metabase/ui/components/navigation/Tabs/Tab.module.css+++ b/frontend/src/metabase/ui/components/navigation/Tabs/Tab.module.css@@ -31,7 +31,7 @@}&:disabled {- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);opacity: 1;}diff --git a/frontend/src/metabase/ui/components/overlays/HoverCard/HoverCard.module.css b/frontend/src/metabase/ui/components/overlays/HoverCard/HoverCard.module.cssindex 05069f346d9..96690934df3 100644--- a/frontend/src/metabase/ui/components/overlays/HoverCard/HoverCard.module.css+++ b/frontend/src/metabase/ui/components/overlays/HoverCard/HoverCard.module.css@@ -1,6 +1,6 @@.dropdown {padding: 0;overflow: auto;- background-color: var(--mb-color-bg-primary);+ background-color: var(--mb-color-background-primary);border: 1px solid var(--mb-color-border);}diff --git a/frontend/src/metabase/ui/components/overlays/Menu/Menu.module.css b/frontend/src/metabase/ui/components/overlays/Menu/Menu.module.cssindex 900f023f21f..df3053a06fb 100644--- a/frontend/src/metabase/ui/components/overlays/Menu/Menu.module.css+++ b/frontend/src/metabase/ui/components/overlays/Menu/Menu.module.css@@ -2,7 +2,7 @@padding: 0.75rem;min-width: 11.5rem;overflow: visible;- background-color: var(--mb-color-background);+ background-color: var(--mb-color-background-primary);border-color: var(--mb-color-border);}@@ -13,7 +13,7 @@padding: var(--mantine-spacing-sm);&[data-disabled="true"] {- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);opacity: 1;}@@ -34,13 +34,13 @@}&[data-position="right"] {- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);margin-left: var(--mantine-spacing-md);}}.label {- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);font-size: var(--mantine-font-size-sm);line-height: var(--mantine-line-height);padding: var(--mantine-spacing-xs) var(--mantine-spacing-sm);diff --git a/frontend/src/metabase/ui/components/overlays/Modal/Modal.module.css b/frontend/src/metabase/ui/components/overlays/Modal/Modal.module.cssindex e1ecbb9108b..40816ae7317 100644--- a/frontend/src/metabase/ui/components/overlays/Modal/Modal.module.css+++ b/frontend/src/metabase/ui/components/overlays/Modal/Modal.module.css@@ -1,5 +1,5 @@.root {- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);}.title {@@ -17,12 +17,12 @@}.content {- background-color: var(--mb-color-background);+ background-color: var(--mb-color-background-primary);border: 1px solid var(--mb-color-border);}.header {- background-color: var(--mb-color-background);+ background-color: var(--mb-color-background-primary);}.ModalCloseButton {diff --git a/frontend/src/metabase/ui/components/overlays/Popover/Popover.module.css b/frontend/src/metabase/ui/components/overlays/Popover/Popover.module.cssindex 030d4b93a9b..0d7ae85f4da 100644--- a/frontend/src/metabase/ui/components/overlays/Popover/Popover.module.css+++ b/frontend/src/metabase/ui/components/overlays/Popover/Popover.module.css@@ -1,7 +1,7 @@.dropdown {padding: 0;overflow: auto;- background: var(--mb-color-background);+ background: var(--mb-color-background-primary);border-color: var(--mb-color-border);color: var(--mb-color-text-primary);}diff --git a/frontend/src/metabase/ui/components/overlays/Tooltip/Tooltip.config.tsx b/frontend/src/metabase/ui/components/overlays/Tooltip/Tooltip.config.tsxindex 6fa952ebf2b..36d69188ae8 100644--- a/frontend/src/metabase/ui/components/overlays/Tooltip/Tooltip.config.tsx+++ b/frontend/src/metabase/ui/components/overlays/Tooltip/Tooltip.config.tsx@@ -20,7 +20,7 @@ export const tooltipOverrides: MantineThemeOverride["components"] = {focus: true,touch: true,},- color: "var(--mb-color-tooltip-background)",+ color: "tooltip-background",},classNames: {tooltip: cx(TooltipStyles.tooltip, ZIndex.Overlay),diff --git a/frontend/src/metabase/ui/components/theme/ThemeProvider/ThemeProvider.unit.spec.tsx b/frontend/src/metabase/ui/components/theme/ThemeProvider/ThemeProvider.unit.spec.tsxindex dddc50bfcc9..e174176279c 100644--- a/frontend/src/metabase/ui/components/theme/ThemeProvider/ThemeProvider.unit.spec.tsx+++ b/frontend/src/metabase/ui/components/theme/ThemeProvider/ThemeProvider.unit.spec.tsx@@ -24,7 +24,7 @@ describe.skip("ThemeProvider", () => {const textCss = window.getComputedStyle(screen.getByText("Text"));expect(textCss.getPropertyValue("font-size")).toBe(OVERRIDES.fontSizes!.xl);- const defaultColor = OVERRIDES.colors?.["text-dark"]?.[0];+ const defaultColor = OVERRIDES.colors?.["text-primary"]?.[0];expect(textCss.getPropertyValue("color")).toBe(Color(defaultColor).rgb().string(),);@@ -34,7 +34,7 @@ describe.skip("ThemeProvider", () => {// Simulate a user-provided theme override.// This is primarily used by the React embedding SDK.const theme: MantineThemeOverride = {- colors: { "text-dark": getColorShades("rgb(12, 34, 56)") },+ colors: { "text-primary": getColorShades("rgb(12, 34, 56)") },};render(diff --git a/frontend/src/metabase/ui/components/typography/Anchor/Anchor.module.css b/frontend/src/metabase/ui/components/typography/Anchor/Anchor.module.cssindex 7840e624324..c43fb629b04 100644--- a/frontend/src/metabase/ui/components/typography/Anchor/Anchor.module.css+++ b/frontend/src/metabase/ui/components/typography/Anchor/Anchor.module.css@@ -2,7 +2,7 @@color: var(--mb-color-brand);&:active {- color: var(--mb-text-text-dark);+ color: var(--mb-color-text-primary);text-decoration: underline;}}diff --git a/frontend/src/metabase/ui/components/typography/Text/Text.config.tsx b/frontend/src/metabase/ui/components/typography/Text/Text.config.tsxindex 8ab68d2177b..ba2619dbdc0 100644--- a/frontend/src/metabase/ui/components/typography/Text/Text.config.tsx+++ b/frontend/src/metabase/ui/components/typography/Text/Text.config.tsx@@ -5,7 +5,7 @@ import TextStyles from "./Text.module.css";export const textOverrides: MantineThemeOverride["components"] = {Text: Text.extend({defaultProps: {- color: "var(--mb-color-text-primary)",+ color: "text-primary",size: "md",component: "div",},diff --git a/frontend/src/metabase/ui/components/utils/Paper/Paper.module.css b/frontend/src/metabase/ui/components/utils/Paper/Paper.module.cssindex e85915d6c11..181c54ce21f 100644--- a/frontend/src/metabase/ui/components/utils/Paper/Paper.module.css+++ b/frontend/src/metabase/ui/components/utils/Paper/Paper.module.css@@ -1,6 +1,6 @@.root {- color: var(--mb-color-text-dark);- background-color: var(--mb-color-bg-white);+ color: var(--mb-color-text-primary);+ background-color: var(--mb-color-background-primary);}.root[data-with-border] {diff --git a/frontend/src/metabase/ui/index.ts b/frontend/src/metabase/ui/index.tsindex d6d7b8d2760..e92a0dd538e 100644--- a/frontend/src/metabase/ui/index.ts+++ b/frontend/src/metabase/ui/index.ts@@ -8,6 +8,8 @@ export type {MantineThemeOther,MantineThemeOverride,PolymorphicComponentProps,+ MantineColorsTuple,} from "@mantine/core";export { useHover } from "@mantine/hooks";+export * from "./components";diff --git a/frontend/src/metabase/ui/syntax/highlight.module.css b/frontend/src/metabase/ui/syntax/highlight.module.cssindex 806484a6609..4ae48cec2d1 100644--- a/frontend/src/metabase/ui/syntax/highlight.module.css+++ b/frontend/src/metabase/ui/syntax/highlight.module.css@@ -32,12 +32,12 @@.comment,.lineComment,.blockComment {- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);font-style: italic;}.brace {- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);}.squareBracket {@@ -58,7 +58,7 @@.arithmeticOperator,.compareOperator {- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);}.escape {diff --git a/frontend/src/metabase/visualizations/components/ChartTooltip/StackedDataTooltip/StackedDataTooltip.styled.tsx b/frontend/src/metabase/visualizations/components/ChartTooltip/StackedDataTooltip/StackedDataTooltip.styled.tsxindex 6ccf8596248..f6db5aa8b48 100644--- a/frontend/src/metabase/visualizations/components/ChartTooltip/StackedDataTooltip/StackedDataTooltip.styled.tsx+++ b/frontend/src/metabase/visualizations/components/ChartTooltip/StackedDataTooltip/StackedDataTooltip.styled.tsx@@ -35,7 +35,8 @@ export const DataPointTableHeader = styled.thead<DataPointTableHeaderProps>``;export const getTooltipSeparatorStyle = (theme: Theme) => css`- border-top: 1px solid ${darken(theme.fn.themeColor("bg-dark"), 0.55)};+ border-top: 1px solid+ ${darken(theme.fn.themeColor("background-tertiary-inverse"), 0.55)};`;export const DataPointTableBody = styled.tbody`diff --git a/frontend/src/metabase/visualizations/components/ChartTooltip/StackedDataTooltip/StackedDataTooltip.tsx b/frontend/src/metabase/visualizations/components/ChartTooltip/StackedDataTooltip/StackedDataTooltip.tsxindex df95ab3c060..7d5dab1c536 100644--- a/frontend/src/metabase/visualizations/components/ChartTooltip/StackedDataTooltip/StackedDataTooltip.tsx+++ b/frontend/src/metabase/visualizations/components/ChartTooltip/StackedDataTooltip/StackedDataTooltip.tsx@@ -58,7 +58,7 @@ const StackedDataTooltip = ({const trimmedBodyRows = groupExcessiveTooltipRows(sortedBodyRows,MAX_BODY_ROWS,- hasColorIndicators ? color("text-light") : undefined,+ hasColorIndicators ? color("text-tertiary") : undefined,);return (diff --git a/frontend/src/metabase/visualizations/components/ChartTooltip/TooltipRow/TooltipRow.styled.tsx b/frontend/src/metabase/visualizations/components/ChartTooltip/TooltipRow/TooltipRow.styled.tsxindex e94bbe6a677..a954875ca90 100644--- a/frontend/src/metabase/visualizations/components/ChartTooltip/TooltipRow/TooltipRow.styled.tsx+++ b/frontend/src/metabase/visualizations/components/ChartTooltip/TooltipRow/TooltipRow.styled.tsx@@ -78,5 +78,5 @@ export const PercentCell = styled(Cell)`export const TotalRowRoot = styled.tr`width: 100%;border-radius: 60px;- background-color: ${() => darken("text-dark", 0.6)};+ background-color: ${() => darken("text-primary", 0.6)};`;diff --git a/frontend/src/metabase/visualizations/components/ClickActions/ClickActionControl.module.css b/frontend/src/metabase/visualizations/components/ClickActions/ClickActionControl.module.cssindex 8f2b812e210..2639105697c 100644--- a/frontend/src/metabase/visualizations/components/ClickActions/ClickActionControl.module.css+++ b/frontend/src/metabase/visualizations/components/ClickActions/ClickActionControl.module.css@@ -1,15 +1,15 @@.horizontalButton[data-variant="inverse"] {&:hover {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);background-color: var(--mb-color-brand);.subtitle {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);}.clickActionButtonIcon,.clickActionButtonTextIcon {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);}}@@ -46,14 +46,14 @@}.infoControl {- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);font-weight: bold;line-height: 1.5rem;max-width: 10.75rem;}.subtitle {- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);font-weight: normal;margin-left: 1rem;}diff --git a/frontend/src/metabase/visualizations/components/ClickActions/ClickActionsViewSection.styled.tsx b/frontend/src/metabase/visualizations/components/ClickActions/ClickActionsViewSection.styled.tsxindex 31a2a63f49d..2581c4a2a27 100644--- a/frontend/src/metabase/visualizations/components/ClickActions/ClickActionsViewSection.styled.tsx+++ b/frontend/src/metabase/visualizations/components/ClickActions/ClickActionsViewSection.styled.tsx@@ -43,5 +43,5 @@ export const SectionWithTitle = styled.div<{export const SectionTitle = styled.p`margin: 0;font-size: 0.875em;- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);`;diff --git a/frontend/src/metabase/visualizations/components/EmptyVizState/EmptyVizState.tsx b/frontend/src/metabase/visualizations/components/EmptyVizState/EmptyVizState.tsxindex 9852f1de948..42c5c092980 100644--- a/frontend/src/metabase/visualizations/components/EmptyVizState/EmptyVizState.tsx+++ b/frontend/src/metabase/visualizations/components/EmptyVizState/EmptyVizState.tsx@@ -79,7 +79,7 @@ export const EmptyVizState = ({<ExternalLink href={url}><Group gap="xs"><strong>{secondaryText}</strong>- <Icon name="external" color="brand" />+ <Icon name="external" c="brand" /></Group></ExternalLink>)}@@ -99,7 +99,7 @@ export const EmptyVizState = ({)} at the top right corner. ${primaryText}`}</Text>- <Text c="text-light">{secondaryText}</Text>+ <Text c="text-tertiary">{secondaryText}</Text></>)}diff --git a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailHeader.styled.tsx b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailHeader.styled.tsxindex 0198a52fc74..72f32fe19a0 100644--- a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailHeader.styled.tsx+++ b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailHeader.styled.tsx@@ -9,7 +9,7 @@ export const ObjectDetailHeaderWrapper = styled.div``;export const ObjectIdLabel = styled.span`- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);margin-left: 0.5rem;`;diff --git a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectRelationships.styled.tsx b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectRelationships.styled.tsxindex bbda14e7ebe..0d00be676fe 100644--- a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectRelationships.styled.tsx+++ b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectRelationships.styled.tsx@@ -7,7 +7,7 @@ export const ObjectRelationships = styled.div`overflow-y: auto;flex: 0 0 100%;padding: 2rem;- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);`;interface ObjectRelationshipContentProps {@@ -20,7 +20,8 @@ export const ObjectRelationContent = styled.div<ObjectRelationshipContentProps>`margin: 1rem 0;padding-bottom: 1rem;border-bottom: 1px solid var(--mb-color-border);- color: ${(props) => color(props.isClickable ? "text-dark" : "text-medium")};+ color: ${(props) =>+ color(props.isClickable ? "text-primary" : "text-secondary")};cursor: ${(props) => props.isClickable && "pointer"};&:hover {diff --git a/frontend/src/metabase/visualizations/components/TableInteractive/utils/table-theme-to-data-grid-theme.ts b/frontend/src/metabase/visualizations/components/TableInteractive/utils/table-theme-to-data-grid-theme.tsindex c28e270346c..bce4677bba0 100644--- a/frontend/src/metabase/visualizations/components/TableInteractive/utils/table-theme-to-data-grid-theme.ts+++ b/frontend/src/metabase/visualizations/components/TableInteractive/utils/table-theme-to-data-grid-theme.ts@@ -9,7 +9,7 @@ export function tableThemeToDataGridTheme(fontSize: tableTheme.cell.fontSize,cell: {backgroundColor:- tableTheme.cell.backgroundColor ?? "var(--mb-color-background)",+ tableTheme.cell.backgroundColor ?? "var(--mb-color-background-primary)",textColor: tableTheme.cell.textColor,},pillCell: {diff --git a/frontend/src/metabase/visualizations/components/TableInteractive/utils/table-theme-to-data-grid-theme.unit.spec.ts b/frontend/src/metabase/visualizations/components/TableInteractive/utils/table-theme-to-data-grid-theme.unit.spec.tsindex 951e6354d07..30a9ef83b3b 100644--- a/frontend/src/metabase/visualizations/components/TableInteractive/utils/table-theme-to-data-grid-theme.unit.spec.ts+++ b/frontend/src/metabase/visualizations/components/TableInteractive/utils/table-theme-to-data-grid-theme.unit.spec.ts@@ -41,7 +41,9 @@ describe("tableThemeToDataGridTheme", () => {const result = tableThemeToDataGridTheme(themeWithoutCellBg);- expect(result.cell?.backgroundColor).toBe("var(--mb-color-background)");+ expect(result.cell?.backgroundColor).toBe(+ "var(--mb-color-background-primary)",+ );});it("prefers cell.backgroundColor over provided backgroundColor", () => {diff --git a/frontend/src/metabase/visualizations/components/Visualization/ErrorView/ErrorView.styled.tsx b/frontend/src/metabase/visualizations/components/Visualization/ErrorView/ErrorView.styled.tsxindex 7917f2c9452..534f8cf88ca 100644--- a/frontend/src/metabase/visualizations/components/Visualization/ErrorView/ErrorView.styled.tsx+++ b/frontend/src/metabase/visualizations/components/Visualization/ErrorView/ErrorView.styled.tsx@@ -15,7 +15,7 @@ export const Root = styled.div<{ isDashboard?: boolean }>`padding-right: 0.5rem;padding-bottom: 0.5rem;color: ${({ isDashboard }) =>- isDashboard ? color("text-medium") : color("text-light")};+ isDashboard ? color("text-secondary") : color("text-tertiary")};`;export const StyledIcon = styled(Icon)`diff --git a/frontend/src/metabase/visualizations/components/Visualization/LoadingView/LoadingView.styled.tsx b/frontend/src/metabase/visualizations/components/Visualization/LoadingView/LoadingView.styled.tsxindex c39a5fc42c4..35ee0dd19f1 100644--- a/frontend/src/metabase/visualizations/components/Visualization/LoadingView/LoadingView.styled.tsx+++ b/frontend/src/metabase/visualizations/components/Visualization/LoadingView/LoadingView.styled.tsx@@ -15,7 +15,7 @@ export const Root = styled.div``;export const SlowQueryMessageContainer = styled.div`- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);`;export const ShortMessage = styled.span`@@ -29,5 +29,5 @@ export const Duration = styled.span``;export const StyledLoadingSpinner = styled(LoadingSpinner)`- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);`;diff --git a/frontend/src/metabase/visualizations/components/Visualization/Visualization.styled.tsx b/frontend/src/metabase/visualizations/components/Visualization/Visualization.styled.tsxindex 7bb3f8a1eb4..b1853058c57 100644--- a/frontend/src/metabase/visualizations/components/Visualization/Visualization.styled.tsx+++ b/frontend/src/metabase/visualizations/components/Visualization/Visualization.styled.tsx@@ -29,5 +29,5 @@ export const VisualizationSlowSpinner = styled(LoadingSpinner,)<VisualizationSlowSpinnerProps>`color: ${(props) =>- props.isUsuallySlow ? color("accent4") : color("text-medium")};+ props.isUsuallySlow ? color("accent4") : color("text-secondary")};`;diff --git a/frontend/src/metabase/visualizations/components/legend/LegendCaption/LegendCaption.styled.tsx b/frontend/src/metabase/visualizations/components/legend/LegendCaption/LegendCaption.styled.tsxindex 8ec96ba745f..7197d9305d2 100644--- a/frontend/src/metabase/visualizations/components/legend/LegendCaption/LegendCaption.styled.tsx+++ b/frontend/src/metabase/visualizations/components/legend/LegendCaption/LegendCaption.styled.tsx@@ -44,11 +44,11 @@ export const LegendDescriptionIcon = styled();}),)`- color: ${({ theme }) => lighten(theme.fn?.themeColor("text-light"), 0.1)};+ color: ${({ theme }) => lighten(theme.fn?.themeColor("text-tertiary"), 0.1)};margin: 0 0.25rem;&:hover {- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);}`;diff --git a/frontend/src/metabase/visualizations/components/legend/LegendItemDot.styled.tsx b/frontend/src/metabase/visualizations/components/legend/LegendItemDot.styled.tsxindex 611129b1853..eeb2c5ed37b 100644--- a/frontend/src/metabase/visualizations/components/legend/LegendItemDot.styled.tsx+++ b/frontend/src/metabase/visualizations/components/legend/LegendItemDot.styled.tsx@@ -17,9 +17,10 @@ export const InnerCircle = styled.div<{ isVisible: boolean }>`border-radius: 50%;color-adjust: exact;background-color: ${(props) =>- props.isVisible ? props.color : "var(--mb-color-background)"};+ props.isVisible ? props.color : "var(--mb-color-background-primary)"};border: 2px solid- ${(props) => (props.isVisible ? props.color : "var(--mb-color-text-light)")};+ ${(props) =>+ props.isVisible ? props.color : "var(--mb-color-text-tertiary)"};transition: all 0.2s;`;diff --git a/frontend/src/metabase/visualizations/components/settings/ChartNestedSettingSeries.styled.tsx b/frontend/src/metabase/visualizations/components/settings/ChartNestedSettingSeries.styled.tsxindex ae4004e005c..a206566edce 100644--- a/frontend/src/metabase/visualizations/components/settings/ChartNestedSettingSeries.styled.tsx+++ b/frontend/src/metabase/visualizations/components/settings/ChartNestedSettingSeries.styled.tsx@@ -5,7 +5,7 @@ import Input from "metabase/common/components/Input";import { Icon, TextInputBlurChange } from "metabase/ui";export const OptionsIcon = styled(Icon)`- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);cursor: pointer;&:hover {diff --git a/frontend/src/metabase/visualizations/components/settings/ChartSettingActionIcon.tsx b/frontend/src/metabase/visualizations/components/settings/ChartSettingActionIcon.tsxindex e3d2d1f0105..5e563ac1391 100644--- a/frontend/src/metabase/visualizations/components/settings/ChartSettingActionIcon.tsx+++ b/frontend/src/metabase/visualizations/components/settings/ChartSettingActionIcon.tsx@@ -26,7 +26,7 @@ export const ChartSettingActionIcon = ({onClick?.(e);}}p={0}- c="text-medium"+ c="text-secondary"size="sm"radius="xl"className={CS.pointerEventsAuto}diff --git a/frontend/src/metabase/visualizations/components/settings/ChartSettingFieldPicker.jsx b/frontend/src/metabase/visualizations/components/settings/ChartSettingFieldPicker.jsxindex 69fdc151bec..b6402a0ab06 100644--- a/frontend/src/metabase/visualizations/components/settings/ChartSettingFieldPicker.jsx+++ b/frontend/src/metabase/visualizations/components/settings/ChartSettingFieldPicker.jsx@@ -94,7 +94,7 @@ export const ChartSettingFieldPicker = ({<ChartSettingFieldPickerRootclassName={className}data-testid="chartsettings-field-picker"- bg="bg-white"+ bg="background-primary"align="center"><ChartSettingSelect@@ -114,7 +114,7 @@ export const ChartSettingFieldPicker = ({noMargin{...dragHandleListeners}onClick={(e) => e.stopPropagation()}- c="text-medium"+ c="text-secondary"className={CS.pointerEventsAll}data-testid="drag-handle"/>@@ -138,7 +138,7 @@ export const ChartSettingFieldPicker = ({rightSection={<>{!disabled && (- <ActionIcon c="text-medium" size="sm" radius="xl" p={0}>+ <ActionIcon c="text-secondary" size="sm" radius="xl" p={0}><Icon name="chevrondown" /></ActionIcon>)}@@ -175,7 +175,9 @@ export const ChartSettingFieldPicker = ({textOverflow: "ellipsis",fontWeight: "bold",- backgroundColor: disabled ? "var(--mb-color-bg-white)" : "inherit",+ backgroundColor: disabled+ ? "var(--mb-color-background-primary)"+ : "inherit",border: "none",width: "100%",diff --git a/frontend/src/metabase/visualizations/components/settings/ChartSettingFieldPicker.styled.tsx b/frontend/src/metabase/visualizations/components/settings/ChartSettingFieldPicker.styled.tsxindex b41ab3728ad..c8dffa99177 100644--- a/frontend/src/metabase/visualizations/components/settings/ChartSettingFieldPicker.styled.tsx+++ b/frontend/src/metabase/visualizations/components/settings/ChartSettingFieldPicker.styled.tsx@@ -6,7 +6,7 @@ import Triggerable from "metabase/common/components/Triggerable";import { Group, Icon } from "metabase/ui";export const GrabberHandle = styled(Icon, { shouldForwardProp: isPropValid })`- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);cursor: grab;`;diff --git a/frontend/src/metabase/visualizations/components/settings/ChartSettingFieldsPartition.tsx b/frontend/src/metabase/visualizations/components/settings/ChartSettingFieldsPartition.tsxindex 0e192a0bc2d..455c99721cc 100644--- a/frontend/src/metabase/visualizations/components/settings/ChartSettingFieldsPartition.tsx+++ b/frontend/src/metabase/visualizations/components/settings/ChartSettingFieldsPartition.tsx@@ -169,7 +169,7 @@ const PartitionContainer = ({return (<Box py="md" className={partitionIndex > 0 ? CS.borderTop : undefined}>- <Text c="text-medium">{title}</Text>+ <Text c="text-secondary">{title}</Text><SortableContextid={partitionName}@@ -186,7 +186,7 @@ const PartitionContainer = ({w="100%"p="0.75rem"bg="border"- c="text-medium"+ c="text-secondary"className={CS.rounded}>{t`Drag fields here`}diff --git a/frontend/src/metabase/visualizations/components/settings/ChartSettingGoalInput.tsx b/frontend/src/metabase/visualizations/components/settings/ChartSettingGoalInput.tsxindex 49cae682c5b..4f75f94ba43 100644--- a/frontend/src/metabase/visualizations/components/settings/ChartSettingGoalInput.tsx+++ b/frontend/src/metabase/visualizations/components/settings/ChartSettingGoalInput.tsx@@ -66,7 +66,7 @@ export const ChartSettingGoalInput = ({withArrow><Menu.Target>- <ActionIcon c="text-medium" size="sm" radius="xl" p={0}>+ <ActionIcon c="text-secondary" size="sm" radius="xl" p={0}><Icon name="chevrondown" /></ActionIcon></Menu.Target>diff --git a/frontend/src/metabase/visualizations/components/settings/ChartSettingMaxCategories.tsx b/frontend/src/metabase/visualizations/components/settings/ChartSettingMaxCategories.tsxindex a217f476dc0..d0a652ad6ef 100644--- a/frontend/src/metabase/visualizations/components/settings/ChartSettingMaxCategories.tsx+++ b/frontend/src/metabase/visualizations/components/settings/ChartSettingMaxCategories.tsx@@ -59,7 +59,7 @@ export const ChartSettingMaxCategories = ({<Textcomponent="label"htmlFor="aggregationFunction"- color="var(--mb-color-text-dark)"+ color="text-primary"fz="sm"mb="sm">{t`Aggregation method for Other group`}</Text>diff --git a/frontend/src/metabase/visualizations/components/settings/ChartSettingMessage.tsx b/frontend/src/metabase/visualizations/components/settings/ChartSettingMessage.tsxindex 6794c519054..57f02d0adf2 100644--- a/frontend/src/metabase/visualizations/components/settings/ChartSettingMessage.tsx+++ b/frontend/src/metabase/visualizations/components/settings/ChartSettingMessage.tsx@@ -9,8 +9,8 @@ export const ChartSettingMessage = ({ children }: PropsWithChildren) => {<Centerpy="md"px={0}- bg="bg-light"- c="text-light"+ bg="background-secondary"+ c="text-tertiary"fw="bold"style={{ borderRadius: theme.radius.md }}>diff --git a/frontend/src/metabase/visualizations/components/settings/ChartSettingSegmentsEditor/ChartSettingSegmentsEditor.tsx b/frontend/src/metabase/visualizations/components/settings/ChartSettingSegmentsEditor/ChartSettingSegmentsEditor.tsxindex cf8070bf8ee..97335e73166 100644--- a/frontend/src/metabase/visualizations/components/settings/ChartSettingSegmentsEditor/ChartSettingSegmentsEditor.tsx+++ b/frontend/src/metabase/visualizations/components/settings/ChartSettingSegmentsEditor/ChartSettingSegmentsEditor.tsx@@ -98,7 +98,7 @@ export const ChartSettingSegmentsEditor = ({<td>{segments.length > 1 && (<Button- leftSection={<Icon name="trash" c="text-light" />}+ leftSection={<Icon name="trash" c="text-tertiary" />}onClick={() =>onChange(segments.filter((v, i) => i !== index))}@@ -126,7 +126,7 @@ function getColorPalette() {color("error"),color("warning"),color("success"),- color("bg-medium"),+ color("background-tertiary"),];}diff --git a/frontend/src/metabase/visualizations/components/settings/ChartSettingSeriesOrder.tsx b/frontend/src/metabase/visualizations/components/settings/ChartSettingSeriesOrder.tsxindex 96dde232b31..3031755c620 100644--- a/frontend/src/metabase/visualizations/components/settings/ChartSettingSeriesOrder.tsx+++ b/frontend/src/metabase/visualizations/components/settings/ChartSettingSeriesOrder.tsx@@ -184,7 +184,7 @@ export const ChartSettingSeriesOrder = ({<Flex justify="space-between" px={4}><Group p={4} gap="sm"><ColorSelector- value={otherColor ?? color("text-light")}+ value={otherColor ?? color("text-tertiary")}colors={getAccentColors()}onChange={onOtherColorChange}pillSize="small"@@ -193,7 +193,7 @@ export const ChartSettingSeriesOrder = ({</Group><Buttonsize="compact-md"- color="text-medium"+ color="text-secondary"variant="subtle"leftSection={<Icon name="gear" />}aria-label={t`Other series settings`}@@ -263,7 +263,7 @@ export const ChartSettingSeriesOrder = ({borderRadius: "8px",fontWeight: "bold","::placeholder": {- color: "var(--mb-color-text-medium)",+ color: "var(--mb-color-text-secondary)",},},}}diff --git a/frontend/src/metabase/visualizations/components/settings/ChartSettingsTableFormatting/RuleListing.tsx b/frontend/src/metabase/visualizations/components/settings/ChartSettingsTableFormatting/RuleListing.tsxindex c3a6bbc1f25..24204f45ec0 100644--- a/frontend/src/metabase/visualizations/components/settings/ChartSettingsTableFormatting/RuleListing.tsx+++ b/frontend/src/metabase/visualizations/components/settings/ChartSettingsTableFormatting/RuleListing.tsx@@ -29,7 +29,7 @@ export const RuleListing = ({<Box><Buttonvariant="subtle"- color="text-dark"+ color="text-primary"onClick={onAdd}leftSection={<Icon name="add" />}>diff --git a/frontend/src/metabase/visualizations/components/settings/ChartSettingsTableFormatting/RulePreview.tsx b/frontend/src/metabase/visualizations/components/settings/ChartSettingsTableFormatting/RulePreview.tsxindex c78f75cfec5..9ece6f52a6f 100644--- a/frontend/src/metabase/visualizations/components/settings/ChartSettingsTableFormatting/RulePreview.tsx+++ b/frontend/src/metabase/visualizations/components/settings/ChartSettingsTableFormatting/RulePreview.tsx@@ -40,7 +40,7 @@ export const RulePreview = ({data-testid="formatting-rule-preview"{...paperProps}>- <Group wrap="nowrap" px="md" bg="bg-light">+ <Group wrap="nowrap" px="md" bg="background-secondary"><Text flex="1" fw="bold" fz="md">{rule.columns.length > 0 ? (rule.columnsdiff --git a/frontend/src/metabase/visualizations/components/settings/ColumnItem/ColumnItem.tsx b/frontend/src/metabase/visualizations/components/settings/ColumnItem/ColumnItem.tsxindex 0cc12286d9c..eacf1866636 100644--- a/frontend/src/metabase/visualizations/components/settings/ColumnItem/ColumnItem.tsx+++ b/frontend/src/metabase/visualizations/components/settings/ColumnItem/ColumnItem.tsx@@ -53,8 +53,8 @@ export const ColumnItem = ({}: ColumnItemProps) => (<Flexw="100%"- bg="bg-white"- c="text-medium"+ bg="background-primary"+ c="text-secondary"className={cx(CS.overflowHidden,CS.bordered,diff --git a/frontend/src/metabase/visualizations/components/skeletons/SkeletonCaption/SkeletonCaption.styled.tsx b/frontend/src/metabase/visualizations/components/skeletons/SkeletonCaption/SkeletonCaption.styled.tsxindex b3d75c4c69b..a3639040990 100644--- a/frontend/src/metabase/visualizations/components/skeletons/SkeletonCaption/SkeletonCaption.styled.tsx+++ b/frontend/src/metabase/visualizations/components/skeletons/SkeletonCaption/SkeletonCaption.styled.tsx@@ -18,7 +18,7 @@ interface SkeletonTitleProps {}export const SkeletonCaptionTitle = styled(Ellipsified)<SkeletonTitleProps>`- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);font-size: ${(props) => (props.size === "large" ? "1rem" : "")};line-height: ${(props) => (props.size === "large" ? "1.375rem" : "")};font-weight: bold;@@ -26,7 +26,7 @@ export const SkeletonCaptionTitle = styled(Ellipsified)<SkeletonTitleProps>``;export const SkeletonCaptionDescription = styled(Icon)`- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);margin-left: 0.5rem;visibility: hidden;`;diff --git a/frontend/src/metabase/visualizations/components/skeletons/StaticSkeleton/StaticSkeleton.styled.tsx b/frontend/src/metabase/visualizations/components/skeletons/StaticSkeleton/StaticSkeleton.styled.tsxindex 1c1f5fdcf53..9663befd599 100644--- a/frontend/src/metabase/visualizations/components/skeletons/StaticSkeleton/StaticSkeleton.styled.tsx+++ b/frontend/src/metabase/visualizations/components/skeletons/StaticSkeleton/StaticSkeleton.styled.tsx@@ -10,27 +10,27 @@ export const SkeletonRoot = styled.div``;export const SkeletonTitle = styled(Ellipsified)`- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);font-size: 1rem;line-height: 1.5rem;font-weight: bold;`;export const SkeletonDescription = styled(MarkdownPreview)`- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);line-height: 1.5rem;`;export const SkeletonIcon = styled(Icon)`display: block;- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);width: 1.5rem;height: 1.5rem;`;export const SkeletonTooltipIcon = styled(Icon)`display: block;- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);width: 0.75rem;height: 0.75rem;`;@@ -43,7 +43,7 @@ export const SkeletonIconContainer = styled.div`&:hover {${SkeletonTooltipIcon} {- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);}}`;@@ -54,5 +54,5 @@ export const SkeletonTooltipIconContainer = styled.div`bottom: -0.5rem;padding: 0.125rem;border-radius: 0.5rem;- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);`;diff --git a/frontend/src/metabase/visualizations/echarts/cartesian/option/goal-line.ts b/frontend/src/metabase/visualizations/echarts/cartesian/option/goal-line.tsindex efaf99704f1..a89c7c4cd4e 100644--- a/frontend/src/metabase/visualizations/echarts/cartesian/option/goal-line.ts+++ b/frontend/src/metabase/visualizations/echarts/cartesian/option/goal-line.ts@@ -75,8 +75,8 @@ export function getGoalLineSeriesOption(},style: {lineWidth: 2,- stroke: renderingContext.getColor("text-medium"),- color: renderingContext.getColor("text-medium"),+ stroke: renderingContext.getColor("text-secondary"),+ color: renderingContext.getColor("text-secondary"),lineDash: GOAL_LINE_DASH,},};@@ -101,7 +101,7 @@ export function getGoalLineSeriesOption(fontFamily: renderingContext.fontFamily,fontSize,fontWeight: CHART_STYLE.goalLine.label.weight,- fill: renderingContext.getColor("text-medium"),+ fill: renderingContext.getColor("text-secondary"),},};diff --git a/frontend/src/metabase/visualizations/echarts/cartesian/option/series.ts b/frontend/src/metabase/visualizations/echarts/cartesian/option/series.tsindex d4b2549cc00..d0848ac2776 100644--- a/frontend/src/metabase/visualizations/echarts/cartesian/option/series.ts+++ b/frontend/src/metabase/visualizations/echarts/cartesian/option/series.ts@@ -301,7 +301,7 @@ export const buildEChartsLabelOptions = (fontWeight: CHART_STYLE.seriesLabels.weight,fontSize,color: renderingContext.getColor("text-primary"),- textBorderColor: renderingContext.getColor("bg-white"),+ textBorderColor: renderingContext.getColor("background-primary"),textBorderWidth: 3,formatter:formatter &&@@ -441,7 +441,7 @@ function getDataLabelSeriesOption(fontWeight: CHART_STYLE.seriesLabels.weight,fontSize: CHART_STYLE.seriesLabels.size,color: renderingContext.getColor("text-primary"),- textBorderColor: renderingContext.getColor("bg-white"),+ textBorderColor: renderingContext.getColor("background-primary"),textBorderWidth: 3,},labelLayout: {@@ -693,7 +693,7 @@ const buildEChartsLineAreaSeries = (},symbol: "circle", // default is "emptyCircle", but it's filled with white, so we need to handle the fill ourselves for dark modeitemStyle: {- color: renderingContext.getColor("bg-white"),+ color: renderingContext.getColor("background-primary"),borderColor: seriesModel.color,borderWidth: lineWidth,opacity: isSymbolVisible ? 1 : 0, // Make the symbol invisible to keep it for event trigger for tooltipdiff --git a/frontend/src/metabase/visualizations/echarts/cartesian/scatter/option/series.ts b/frontend/src/metabase/visualizations/echarts/cartesian/scatter/option/series.tsindex e3462310572..45f8799bd6c 100644--- a/frontend/src/metabase/visualizations/echarts/cartesian/scatter/option/series.ts+++ b/frontend/src/metabase/visualizations/echarts/cartesian/scatter/option/series.ts@@ -69,7 +69,7 @@ export function buildEChartsScatterSeries(itemStyle: {color: seriesModel.color,opacity: CHART_STYLE.opacity.scatter,- borderColor: renderingContext.getColor("bg-white"),+ borderColor: renderingContext.getColor("background-primary"),borderWidth: 1,},emphasis: {diff --git a/frontend/src/metabase/visualizations/echarts/cartesian/timeline-events/option.ts b/frontend/src/metabase/visualizations/echarts/cartesian/timeline-events/option.tsindex db1853f354a..4744e1a7f22 100644--- a/frontend/src/metabase/visualizations/echarts/cartesian/timeline-events/option.ts+++ b/frontend/src/metabase/visualizations/echarts/cartesian/timeline-events/option.ts@@ -54,7 +54,7 @@ export const getTimelineEventsSeries = (selectedEventsIds.includes(event.id),);- const color = getColor(isSelected ? "brand" : "text-light");+ const color = getColor(isSelected ? "brand" : "text-tertiary");const iconName =events.length === 1 ? (events[0].icon as IconName) : "star";diff --git a/frontend/src/metabase/visualizations/echarts/graph/sankey/option/index.ts b/frontend/src/metabase/visualizations/echarts/graph/sankey/option/index.tsindex daf032377ee..79a5586f4f1 100644--- a/frontend/src/metabase/visualizations/echarts/graph/sankey/option/index.ts+++ b/frontend/src/metabase/visualizations/echarts/graph/sankey/option/index.ts@@ -67,7 +67,7 @@ export const getSankeyChartOption = (color: renderingContext.getColor("text-primary"),fontSize: SANKEY_CHART_STYLE.edgeLabels.size,textBorderWidth: SANKEY_CHART_STYLE.edgeLabels.textBorderWidth,- textBorderColor: renderingContext.getColor("bg-white"),+ textBorderColor: renderingContext.getColor("background-primary"),fontFamily: renderingContext.fontFamily,},emphasis: {@@ -88,7 +88,7 @@ export const getSankeyChartOption = (fontWeight: nodeLabelStyle.weight,fontFamily: nodeLabelStyle.family,textBorderWidth: SANKEY_CHART_STYLE.nodeLabels.textBorderWidth,- textBorderColor: renderingContext.getColor("bg-white"),+ textBorderColor: renderingContext.getColor("background-primary"),formatter: (param) => {const shouldTruncate = layout.nodeIndicesWithTruncatedLabels?.has(param.dataIndex,diff --git a/frontend/src/metabase/visualizations/echarts/pie/model/index.ts b/frontend/src/metabase/visualizations/echarts/pie/model/index.tsindex 0a54b9e05c0..20008ea2e9f 100644--- a/frontend/src/metabase/visualizations/echarts/pie/model/index.ts+++ b/frontend/src/metabase/visualizations/echarts/pie/model/index.ts@@ -192,7 +192,7 @@ function aggregateChildrenSlices(value: otherTotal,rawValue: otherTotal,normalizedPercentage: Math.abs(otherTotal / node.value),- color: renderingContext.getColor("text-light"),+ color: renderingContext.getColor("text-tertiary"),children: otherSliceChildren,visible: true,isOther: true,@@ -497,7 +497,7 @@ export function getPieChartModel(value: Math.abs(otherTotal),rawValue: otherTotal,normalizedPercentage: visible ? Math.abs(otherTotal / total) : 0,- color: renderingContext.getColor("text-light"),+ color: renderingContext.getColor("text-tertiary"),column: colDescs.dimensionDesc.column,visible,children,@@ -535,7 +535,7 @@ export function getPieChartModel(value: 1,rawValue: 0,normalizedPercentage: 0,- color: renderingContext.getColor("text-light"),+ color: renderingContext.getColor("text-tertiary"),visible: true,column: colDescs.dimensionDesc.column,children: new Map(),diff --git a/frontend/src/metabase/visualizations/lib/exports-branding-utils.tsx b/frontend/src/metabase/visualizations/lib/exports-branding-utils.tsxindex c442363fd22..dd495091ddd 100644--- a/frontend/src/metabase/visualizations/lib/exports-branding-utils.tsx+++ b/frontend/src/metabase/visualizations/lib/exports-branding-utils.tsx@@ -98,7 +98,7 @@ export const createBrandingElement = (size: BrandingSize) => {brandingCopy.style.cssText = `font-family: "Lato", sans-serif;font-size: ${fz}px;- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);display: inline-block;margin-inline-end: ${m}px;vertical-align: middle;diff --git a/frontend/src/metabase/visualizations/lib/settings/graph.js b/frontend/src/metabase/visualizations/lib/settings/graph.jsindex c895914c70c..2785ad37c85 100644--- a/frontend/src/metabase/visualizations/lib/settings/graph.js+++ b/frontend/src/metabase/visualizations/lib/settings/graph.js@@ -600,7 +600,7 @@ export const GRAPH_DISPLAY_VALUES_SETTINGS = {],},"graph.other_category_color": {- default: color("text-light"),+ default: color("text-tertiary"),},"graph.other_category_aggregation_fn": {hidden: true,diff --git a/frontend/src/metabase/visualizations/shared/utils/theme.ts b/frontend/src/metabase/visualizations/shared/utils/theme.tsindex 98df196bfd5..c3421cd1364 100644--- a/frontend/src/metabase/visualizations/shared/utils/theme.ts+++ b/frontend/src/metabase/visualizations/shared/utils/theme.ts@@ -15,7 +15,7 @@ function getPieBorderColor(return dashboardCardBg;}if (questionBg === "transparent") {- return "var(--mb-color-bg-white)";+ return "var(--mb-color-background-primary)";}return questionBg;}@@ -61,7 +61,7 @@ export function getVisualizationTheme({},pie: {borderColor: isStaticViz- ? Color(color("text-white")).hex()+ ? Color(color("text-primary-inverse")).hex(): getPieBorderColor(dashboard.card.backgroundColor,question.backgroundColor,diff --git a/frontend/src/metabase/visualizations/visualizations/Gauge/Gauge.jsx b/frontend/src/metabase/visualizations/visualizations/Gauge/Gauge.jsxindex 5dde3cb4163..6af094bda5e 100644--- a/frontend/src/metabase/visualizations/visualizations/Gauge/Gauge.jsx+++ b/frontend/src/metabase/visualizations/visualizations/Gauge/Gauge.jsx@@ -34,11 +34,11 @@ const ARROW_BASE = ARROW_HEIGHT / Math.tan((64 / 180) * Math.PI);const ARROW_STROKE_THICKNESS = 1.25;// colors-const getBackgroundArcColor = () => color("bg-medium");-const getSegmentLabelColor = () => color("text-dark");-const getCenterLabelColor = () => color("text-dark");-const getArrowFillColor = () => color("text-medium-opaque");-const getArrowStrokeColor = () => color("bg-white");+const getBackgroundArcColor = () => color("background-tertiary");+const getSegmentLabelColor = () => color("text-primary");+const getCenterLabelColor = () => color("text-primary");+const getArrowFillColor = () => color("text-secondary-opaque");+const getArrowStrokeColor = () => color("background-primary");// in px, because scaling was not working well with PDF Exports (metabase#65322)const FONT_SIZE_SEGMENT_LABEL = 4;@@ -437,7 +437,7 @@ const GaugeSegmentLabel = ({ position: [x, y], style = {}, children }) => (x={x}y={y}style={{- fill: "var(--mb-color-text-medium)",+ fill: "var(--mb-color-text-secondary)",fontSize: `${FONT_SIZE_SEGMENT_LABEL}px`,textAnchor: Math.abs(x) < 5 ? "middle" : x > 0 ? "start" : "end",// shift text in the lower half down a bitdiff --git a/frontend/src/metabase/visualizations/visualizations/Heading/Heading.styled.tsx b/frontend/src/metabase/visualizations/visualizations/Heading/Heading.styled.tsxindex 135bebe0d21..8b290553e3c 100644--- a/frontend/src/metabase/visualizations/visualizations/Heading/Heading.styled.tsx+++ b/frontend/src/metabase/visualizations/visualizations/Heading/Heading.styled.tsx@@ -46,7 +46,7 @@ export const InputContainer = styled.div<InputContainerProps>`isEmpty &&css`border: 1px solid var(--mb-color-brand);- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);`}`;@@ -54,7 +54,7 @@ const TextInput = styled.input`border: none;background: none;max-height: 100%;- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);font-size: 1.375rem;font-weight: 700;height: inherit;diff --git a/frontend/src/metabase/visualizations/visualizations/Heading/Heading.unit.spec.tsx b/frontend/src/metabase/visualizations/visualizations/Heading/Heading.unit.spec.tsxindex 5b997218552..c1fb22ae4e5 100644--- a/frontend/src/metabase/visualizations/visualizations/Heading/Heading.unit.spec.tsx+++ b/frontend/src/metabase/visualizations/visualizations/Heading/Heading.unit.spec.tsx@@ -131,7 +131,7 @@ describe("Text", () => {);expect(screen.getByTestId("editing-dashboard-heading-container")).toHaveStyle(`border: 1px solid var(--mb-color-brand);- color: var(--mb-color-text-light);`);+ color: var(--mb-color-text-tertiary);`);});it("should preview with text when it has content", () => {diff --git a/frontend/src/metabase/visualizations/visualizations/IFrameViz/IFrameViz.tsx b/frontend/src/metabase/visualizations/visualizations/IFrameViz/IFrameViz.tsxindex b1753eb1f65..e4f843ad00e 100644--- a/frontend/src/metabase/visualizations/visualizations/IFrameViz/IFrameViz.tsx+++ b/frontend/src/metabase/visualizations/visualizations/IFrameViz/IFrameViz.tsx@@ -182,15 +182,15 @@ function ForbiddenDomainError({ url }: { url: string }) {return (<Box p={12} w="100%" style={{ textAlign: "center" }}>- <Icon name="lock" color="var(--mb-color-text-dark)" mb="s" />- <Text color="text-dark">+ <Icon name="lock" c="text-primary" mb="s" />+ <Text c="text-primary">{jt`${(<Text key="domain" fw="bold" display="inline">{domain}</Text>)} can not be embedded in iframe cards.`}</Text>- <InteractiveText c="text-dark" px="lg" mt="md">+ <InteractiveText c="text-primary" px="lg" mt="md">{renderMessage()}</InteractiveText></Box>@@ -200,8 +200,8 @@ function ForbiddenDomainError({ url }: { url: string }) {function GenericError() {return (<Box p={12} w="100%" style={{ textAlign: "center" }}>- <Icon name="lock" color="var(--mb-color-text-dark)" mb="s" />- <Text color="text-dark">+ <Icon name="lock" c="text-primary" mb="s" />+ <Text color="text-primary">{t`There was a problem rendering this content.`}</Text></Box>diff --git a/frontend/src/metabase/visualizations/visualizations/LinkViz/EntityDisplay.tsx b/frontend/src/metabase/visualizations/visualizations/LinkViz/EntityDisplay.tsxindex 12e0ee74d4d..fd18e746c12 100644--- a/frontend/src/metabase/visualizations/visualizations/LinkViz/EntityDisplay.tsx+++ b/frontend/src/metabase/visualizations/visualizations/LinkViz/EntityDisplay.tsx@@ -22,13 +22,13 @@ export const EntityDisplay = ({return (<EntityDisplayContainer><LeftContainer>- <Icon color="var(--mb-color-brand)" name={getSearchIconName(entity)} />+ <Icon c="brand" name={getSearchIconName(entity)} /><EllipsifiedEntityContainer>{entity?.name}</EllipsifiedEntityContainer></LeftContainer>{showDescription && entity?.description && (<Iconname="info"- color="var(--mb-color-text-light)"+ c="text-tertiary"tooltip={<Markdown dark disallowHeading unstyleLinks lineClamp={8}>{entity.description}@@ -43,7 +43,7 @@ export const EntityDisplay = ({export const RestrictedEntityDisplay = () => (<EntityDisplayContainer><LeftContainer>- <Icon name="key" color="var(--mb-color-text-light)" />+ <Icon name="key" c="text-tertiary" /><EllipsifiedEntityContainer>{t`Sorry, you don't have permission to see this link.`}</EllipsifiedEntityContainer></LeftContainer></EntityDisplayContainer>diff --git a/frontend/src/metabase/visualizations/visualizations/LinkViz/LinkViz.styled.tsx b/frontend/src/metabase/visualizations/visualizations/LinkViz/LinkViz.styled.tsxindex b25924193f6..c48837f1d3f 100644--- a/frontend/src/metabase/visualizations/visualizations/LinkViz/LinkViz.styled.tsx+++ b/frontend/src/metabase/visualizations/visualizations/LinkViz/LinkViz.styled.tsx@@ -59,7 +59,7 @@ const searchResultsStyles = `min-width: 20rem;overflow-y: auto;- background-color: var(--mb-color-bg-white);+ background-color: var(--mb-color-background-primary);line-height: 24px;max-height: 400px;diff --git a/frontend/src/metabase/visualizations/visualizations/Map/Maps.styled.tsx b/frontend/src/metabase/visualizations/visualizations/Map/Maps.styled.tsxindex 74a57ef428f..541e7559285 100644--- a/frontend/src/metabase/visualizations/visualizations/Map/Maps.styled.tsx+++ b/frontend/src/metabase/visualizations/visualizations/Map/Maps.styled.tsx@@ -5,7 +5,7 @@ export const CustomMapContent = styled.div`border-top: 1px solid var(--mb-color-border);padding: 0.75rem 1.5rem;justify-content: space-between;- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);font-weight: 700;display: flex;`;diff --git a/frontend/src/metabase/visualizations/visualizations/PivotTable/PivotTable.stories.tsx b/frontend/src/metabase/visualizations/visualizations/PivotTable/PivotTable.stories.tsxindex c7250dd410d..9f503eb508f 100644--- a/frontend/src/metabase/visualizations/visualizations/PivotTable/PivotTable.stories.tsx+++ b/frontend/src/metabase/visualizations/visualizations/PivotTable/PivotTable.stories.tsx@@ -27,8 +27,7 @@ export const EmbeddingTheme: StoryFn = () => {const theme = {colors: {border: "#95a5a6",- background: "#4c5773",- "background-hover": "#46464b",+ background: "#46464b",},components: {table: {diff --git a/frontend/src/metabase/visualizations/visualizations/PivotTable/PivotTable.styled.tsx b/frontend/src/metabase/visualizations/visualizations/PivotTable/PivotTable.styled.tsxindex 2513069c2e4..f2481b1a8a4 100644--- a/frontend/src/metabase/visualizations/visualizations/PivotTable/PivotTable.styled.tsx+++ b/frontend/src/metabase/visualizations/visualizations/PivotTable/PivotTable.styled.tsx@@ -56,7 +56,7 @@ const getCellBackgroundColor = ({if (isEmphasized) {if (isDarkMode) {- return color("bg-black");+ return color("background-primary-inverse");}if (backgroundColor) {@@ -67,10 +67,10 @@ const getCellBackgroundColor = ({}if (isDarkMode) {- return alpha("bg-black", 0.1);+ return alpha("background-primary-inverse", 0.1);}- return color(backgroundColor ?? "bg-white");+ return color(backgroundColor ?? "background-primary");};const getCellHoverBackground = (@@ -89,7 +89,7 @@ const getCellHoverBackground = (const getColor = ({ theme }: PivotTableCellProps & { theme: MantineTheme }) => {if (theme.other.colorScheme === "dark") {- return color("text-white");+ return color("text-primary-inverse");}return color(theme.other.table.cell.textColor);@@ -120,7 +120,7 @@ export const PivotTableCell = styled.div<PivotTableCellProps>`border-bottom: 1px solid${(props) =>props.isBorderedHeader- ? color("border-secondary")+ ? "var(--mb-color-border)": "var(--mb-color-table-border)"};background-color: ${getCellBackgroundColor};${(props) =>@@ -192,7 +192,7 @@ export const PivotTableRoot = styled.div<PivotTableRootProps>`export const PivotTableSettingLabel = styled.span`font-weight: 700;- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);`;export const ResizeHandle = styled.div`diff --git a/frontend/src/metabase/visualizations/visualizations/SmartScalar/PreviousValueComparison/DetailCandidate.tsx b/frontend/src/metabase/visualizations/visualizations/SmartScalar/PreviousValueComparison/DetailCandidate.tsxindex 43c77a95b4a..cbc48ab059b 100644--- a/frontend/src/metabase/visualizations/visualizations/SmartScalar/PreviousValueComparison/DetailCandidate.tsx+++ b/frontend/src/metabase/visualizations/visualizations/SmartScalar/PreviousValueComparison/DetailCandidate.tsx@@ -1,12 +1,13 @@import { jt } from "ttag";+import type { ColorName } from "metabase/lib/colors/types";import { isEmpty } from "metabase/lib/validate";import { Text } from "metabase/ui";import type { ComparisonResult } from "../compute";interface Props {- color: string;+ color: ColorName;comparison: ComparisonResult;valueFormatted: string | number | JSX.Element | null;}diff --git a/frontend/src/metabase/visualizations/visualizations/SmartScalar/PreviousValueComparison/PreviousValueComparison.styled.tsx b/frontend/src/metabase/visualizations/visualizations/SmartScalar/PreviousValueComparison/PreviousValueComparison.styled.tsxindex 8fcf17b96e5..0d17970ebac 100644--- a/frontend/src/metabase/visualizations/visualizations/SmartScalar/PreviousValueComparison/PreviousValueComparison.styled.tsx+++ b/frontend/src/metabase/visualizations/visualizations/SmartScalar/PreviousValueComparison/PreviousValueComparison.styled.tsx@@ -9,7 +9,6 @@ export const VariationIcon = styled(Icon)`align-items: center;flex: 0 0 auto;margin-right: var(--mantine-spacing-sm);- color: ${(props) => props.color};`;export const VariationValue = styled(Ellipsified)`diff --git a/frontend/src/metabase/visualizations/visualizations/SmartScalar/PreviousValueComparison/PreviousValueComparison.tsx b/frontend/src/metabase/visualizations/visualizations/SmartScalar/PreviousValueComparison/PreviousValueComparison.tsxindex 0ba46fe32dd..be64073ba28 100644--- a/frontend/src/metabase/visualizations/visualizations/SmartScalar/PreviousValueComparison/PreviousValueComparison.tsx+++ b/frontend/src/metabase/visualizations/visualizations/SmartScalar/PreviousValueComparison/PreviousValueComparison.tsx@@ -74,7 +74,7 @@ export function PreviousValueComparison({// intentionally calling the component as a function// since otherwise measurements don't work as expectedreturn DetailCandidate({- color: "var(--mb-color-text-secondary)",+ color: "text-secondary",comparison,valueFormatted,});@@ -120,14 +120,14 @@ export function PreviousValueComparison({className={DashboardS.fullscreenNormalText}><VariationPercent- color="text-light"+ color="text-tertiary"comparison={comparison}iconSize={ICON_SIZE}>{fittedChangeDisplay}</VariationPercent>- <VariationDetails color="var(--mb-color-text-secondary)">+ <VariationDetails color="text-secondary">{fittedDetailDisplay}</VariationDetails>diff --git a/frontend/src/metabase/visualizations/visualizations/SmartScalar/PreviousValueComparison/VariationDetails.tsx b/frontend/src/metabase/visualizations/visualizations/SmartScalar/PreviousValueComparison/VariationDetails.tsxindex 621e2bfdc76..1276764bad4 100644--- a/frontend/src/metabase/visualizations/visualizations/SmartScalar/PreviousValueComparison/VariationDetails.tsx+++ b/frontend/src/metabase/visualizations/visualizations/SmartScalar/PreviousValueComparison/VariationDetails.tsx@@ -1,10 +1,11 @@import type { ReactNode } from "react";+import type { ColorName } from "metabase/lib/colors/types";import { Title } from "metabase/ui";interface Props {children: ReactNode;- color?: string;+ color?: ColorName;}export const VariationDetails = ({ children, color }: Props) => {diff --git a/frontend/src/metabase/visualizations/visualizations/SmartScalar/PreviousValueComparison/VariationPercent.tsx b/frontend/src/metabase/visualizations/visualizations/SmartScalar/PreviousValueComparison/VariationPercent.tsxindex 6c12c7410ac..1df02481e91 100644--- a/frontend/src/metabase/visualizations/visualizations/SmartScalar/PreviousValueComparison/VariationPercent.tsx+++ b/frontend/src/metabase/visualizations/visualizations/SmartScalar/PreviousValueComparison/VariationPercent.tsx@@ -1,5 +1,6 @@import type { ReactNode } from "react";+import type { ColorName } from "metabase/lib/colors/types";import { Flex } from "metabase/ui";import type { ComparisonResult } from "../compute";@@ -11,7 +12,7 @@ import {interface Props {children: ReactNode;- color?: string;+ color?: ColorName;comparison: ComparisonResult;iconSize: string | number;}diff --git a/frontend/src/metabase/visualizations/visualizations/SmartScalar/SettingsComponents/PeriodsAgoMenuOption.tsx b/frontend/src/metabase/visualizations/visualizations/SmartScalar/SettingsComponents/PeriodsAgoMenuOption.tsxindex afeaff84b93..fc5ea919891 100644--- a/frontend/src/metabase/visualizations/visualizations/SmartScalar/SettingsComponents/PeriodsAgoMenuOption.tsx+++ b/frontend/src/metabase/visualizations/visualizations/SmartScalar/SettingsComponents/PeriodsAgoMenuOption.tsx@@ -110,7 +110,7 @@ export function PeriodsAgoMenuOption({<Text fw="bold">{name}</Text></Group>{!!message && (- <Text size="xs" color="text-light" mt="xs">+ <Text size="xs" color="text-tertiary" mt="xs">{message}</Text>)}diff --git a/frontend/src/metabase/visualizations/visualizations/SmartScalar/SettingsComponents/SmartScalarSettingsWidgets.styled.tsx b/frontend/src/metabase/visualizations/visualizations/SmartScalar/SettingsComponents/SmartScalarSettingsWidgets.styled.tsxindex 6ae94c268fb..ed840caa19e 100644--- a/frontend/src/metabase/visualizations/visualizations/SmartScalar/SettingsComponents/SmartScalarSettingsWidgets.styled.tsx+++ b/frontend/src/metabase/visualizations/visualizations/SmartScalar/SettingsComponents/SmartScalarSettingsWidgets.styled.tsx@@ -53,7 +53,7 @@ export const DoneButton = (props: ButtonProps) => (export const DragHandleIcon = styled(Icon)`cursor: grab;- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);`;export const ExpandIcon = styled(Icon)`@@ -61,5 +61,5 @@ export const ExpandIcon = styled(Icon)``;export const RemoveIcon = styled(Icon)`- color: var(--mb-color-text-dark);+ color: var(--mb-color-text-primary);`;diff --git a/frontend/src/metabase/visualizations/visualizations/Table/Table.stories.tsx b/frontend/src/metabase/visualizations/visualizations/Table/Table.stories.tsxindex 6a433984a21..df0074368b6 100644--- a/frontend/src/metabase/visualizations/visualizations/Table/Table.stories.tsx+++ b/frontend/src/metabase/visualizations/visualizations/Table/Table.stories.tsx@@ -12,6 +12,7 @@ import {} from "__support__/storybook";import { Api } from "metabase/api";import type { MetabaseTheme } from "metabase/embedding-sdk/theme";+import type { ColorName } from "metabase/lib/colors/types";import { MetabaseReduxProvider } from "metabase/lib/redux";import { commonReducers } from "metabase/reducers-common";import { Box } from "metabase/ui";@@ -65,7 +66,7 @@ const DefaultTemplate: StoryFn<{}: {series: RawSeries;isDashboard?: boolean;- bgColor?: string;+ bgColor?: ColorName;theme?: MetabaseTheme;hasDevWatermark?: boolean;}) => {diff --git a/frontend/src/metabase/visualizations/visualizations/Text/Text.styled.tsx b/frontend/src/metabase/visualizations/visualizations/Text/Text.styled.tsxindex cedaf8b3bf2..05e3b50b895 100644--- a/frontend/src/metabase/visualizations/visualizations/Text/Text.styled.tsx+++ b/frontend/src/metabase/visualizations/visualizations/Text/Text.styled.tsx@@ -81,7 +81,7 @@ export const EditModeContainer = styled(TextCardWrapper)<EditModeProps>`isEmpty &&css`border: 1px solid var(--mb-color-brand);- color: var(--mb-color-text-light);+ color: var(--mb-color-text-tertiary);`}${({ isSingleRow, isPreviewing, isEmpty, isMobile, isFixedWidth }) => {@@ -271,17 +271,17 @@ export const ReactMarkdownStyleWrapper = styled.div`}.text-card-markdown tr {- border-bottom: 1px solid var(--mb-color-border-alpha-30);+ border-bottom: 1px solid var(--mb-color-border);}.text-card-markdown tr:nth-of-type(even) {- background-color: ${() => alpha("bg-black", 0.05)};+ background-color: ${() => alpha("background-primary-inverse", 0.05)};}.text-card-markdown th,.text-card-markdown td {padding: 0.75em;- border: 1px solid var(--mb-color-border-alpha-30);+ border: 1px solid var(--mb-color-border);}.text-card-markdown code {@@ -289,7 +289,7 @@ export const ReactMarkdownStyleWrapper = styled.div`font-size: 12.64px;line-height: 20px;padding: 0 0.25em;- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);border-radius: 8px;}@@ -300,7 +300,7 @@ export const ReactMarkdownStyleWrapper = styled.div`}.text-card-markdown blockquote {- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);border-left: 5px solid var(--mb-color-border);padding: 0 1.5em 0 17px;margin: 0.5em 0 0.5em 1em;@@ -331,7 +331,7 @@ export const TextInput = styled.textarea<TextAreaProps>`display: flex;flex-direction: column;flex: 1 0 auto;- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);border: none;border-radius: 8px;box-shadow: none;diff --git a/frontend/src/metabase/visualizations/visualizations/Text/Text.unit.spec.tsx b/frontend/src/metabase/visualizations/visualizations/Text/Text.unit.spec.tsxindex 2286dc7e997..8b4a84159a4 100644--- a/frontend/src/metabase/visualizations/visualizations/Text/Text.unit.spec.tsx+++ b/frontend/src/metabase/visualizations/visualizations/Text/Text.unit.spec.tsx@@ -111,7 +111,7 @@ describe("Text", () => {);expect(screen.getByTestId("editing-dashboard-text-container")).toHaveStyle(`border: 1px solid var(--mb-color-brand);- color: var(--mb-color-text-light);`);+ color: var(--mb-color-text-tertiary);`);});it("should preview with text when it has content", () => {diff --git a/frontend/src/metabase/visualizations/visualizations/WaterfallChart/WaterfallChart.tsx b/frontend/src/metabase/visualizations/visualizations/WaterfallChart/WaterfallChart.tsxindex c1bbb893c9d..28f9f39e3c8 100644--- a/frontend/src/metabase/visualizations/visualizations/WaterfallChart/WaterfallChart.tsx+++ b/frontend/src/metabase/visualizations/visualizations/WaterfallChart/WaterfallChart.tsx@@ -68,7 +68,8 @@ Object.assign(props: { title: t`Total color` },widget: "color",// Unfortunately, to get static viz to look right, we need to avoid using alpha colors here- getDefault: () => Color(color("text-dark", staticVizOverrides)).hex(),+ getDefault: () =>+ Color(color("text-primary", staticVizOverrides)).hex(),getHidden: (_series: any, vizSettings: ComputedVisualizationSettings) =>vizSettings["waterfall.show_total"] !== true,readDependencies: ["waterfall.show_total"],diff --git a/frontend/src/metabase/visualizer/components/DataImporter/ColumnsList/ColumnsList.tsx b/frontend/src/metabase/visualizer/components/DataImporter/ColumnsList/ColumnsList.tsxindex 2dff74e1207..ce661cdcf43 100644--- a/frontend/src/metabase/visualizer/components/DataImporter/ColumnsList/ColumnsList.tsx+++ b/frontend/src/metabase/visualizer/components/DataImporter/ColumnsList/ColumnsList.tsx@@ -284,7 +284,7 @@ function DraggableColumnListItem({{...props}{...attributes}{...listeners}- bg={isSelected ? "var(--mb-color-brand-lighter)" : undefined}+ bg={isSelected ? "brand-lighter" : undefined}column={column}style={{ visibility: isDragging ? "hidden" : "visible" }}aria-selected={isSelected}diff --git a/frontend/src/metabase/visualizer/components/DataImporter/ColumnsList/ColumnsListItem.module.css b/frontend/src/metabase/visualizer/components/DataImporter/ColumnsList/ColumnsListItem.module.cssindex 2f4668db84d..35eee25eb85 100644--- a/frontend/src/metabase/visualizer/components/DataImporter/ColumnsList/ColumnsListItem.module.css+++ b/frontend/src/metabase/visualizer/components/DataImporter/ColumnsList/ColumnsListItem.module.css@@ -1,6 +1,6 @@.grabber {visibility: hidden;- color: var(--mb-color-text-medium);+ color: var(--mb-color-text-secondary);}.parent {@@ -14,7 +14,7 @@}.parent:hover {- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);cursor: grab;border-color: var(--mb-color-border);}diff --git a/frontend/src/metabase/visualizer/components/DataImporter/ColumnsList/ColumnsListItem.tsx b/frontend/src/metabase/visualizer/components/DataImporter/ColumnsList/ColumnsListItem.tsxindex 208acd384c2..af347162841 100644--- a/frontend/src/metabase/visualizer/components/DataImporter/ColumnsList/ColumnsListItem.tsx+++ b/frontend/src/metabase/visualizer/components/DataImporter/ColumnsList/ColumnsListItem.tsx@@ -47,7 +47,7 @@ export const ColumnsListItem = forwardRef<HTMLDivElement, ColumnsListItemProps>(style.border = "2px solid var(--mb-color-brand)";style.boxShadow = "0px 1px 4px 1px var(--mb-color-shadow)";style.cursor = "grab";- style.backgroundColor = "var(--mb-color-bg-light)";+ style.backgroundColor = "var(--mb-color-background-secondary)";style.borderRadius = "var(--default-border-radius)";}return style;diff --git a/frontend/src/metabase/visualizer/components/DataImporter/DataImporter.tsx b/frontend/src/metabase/visualizer/components/DataImporter/DataImporter.tsxindex 376380d190e..84186a67288 100644--- a/frontend/src/metabase/visualizer/components/DataImporter/DataImporter.tsx+++ b/frontend/src/metabase/visualizer/components/DataImporter/DataImporter.tsx@@ -123,7 +123,7 @@ export const DataImporter = ({ className }: { className?: string }) => {<Flexdirection="column"className={S.Content}- bg="var(--mb-color-bg-white)"+ bg="background-primary"h="100%"display={showDatasets ? "none" : "flex"}bd="1px solid var(--mb-color-border)"@@ -142,7 +142,7 @@ export const DataImporter = ({ className }: { className?: string }) => {<Flexdirection="column"className={S.Content}- bg="var(--mb-color-bg-white)"+ bg="background-primary"style={{borderRadius: "var(--default-border-radius)",height: "100%",diff --git a/frontend/src/metabase/visualizer/components/DataImporter/DatasetsList/DatasetsListItem.module.css b/frontend/src/metabase/visualizer/components/DataImporter/DatasetsList/DatasetsListItem.module.cssindex 7c326327048..0a57995529f 100644--- a/frontend/src/metabase/visualizer/components/DataImporter/DatasetsList/DatasetsListItem.module.css+++ b/frontend/src/metabase/visualizer/components/DataImporter/DatasetsList/DatasetsListItem.module.css@@ -41,7 +41,7 @@.DatasetsListItemSelected,.DatasetsListItemSelected:hover {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);background-color: var(--mb-color-brand);}@@ -53,5 +53,5 @@}.AddButton[data-variant="inverse"] {- --button-color: var(--mb-color-text-light);+ --button-color: var(--mb-color-text-tertiary);}diff --git a/frontend/src/metabase/visualizer/components/DataImporter/DatasetsList/DatasetsListItem.tsx b/frontend/src/metabase/visualizer/components/DataImporter/DatasetsList/DatasetsListItem.tsxindex dec0a4c1ad5..c67654ce96f 100644--- a/frontend/src/metabase/visualizer/components/DataImporter/DatasetsList/DatasetsListItem.tsx+++ b/frontend/src/metabase/visualizer/components/DataImporter/DatasetsList/DatasetsListItem.tsx@@ -39,14 +39,14 @@ export const DatasetsListItem = (props: DatasetsListItemProps) => {}}leftSection={<Box>- <Icon color="inherit" className={S.TableIcon} name="table2" mr="xs" />+ <Icon c="inherit" className={S.TableIcon} name="table2" mr="xs" />{item.notRecommended && (<Tooltiplabel={t`This dataset might not be fully compatible with your current selection.`}><IconclassName={S.WarningIcon}- color="var(--mb-color-danger)"+ c="danger"name="warning_round_filled"size={10}/>diff --git a/frontend/src/metabase/visualizer/components/Header/Header.tsx b/frontend/src/metabase/visualizer/components/Header/Header.tsxindex e1187285a25..f0d0681cf36 100644--- a/frontend/src/metabase/visualizer/components/Header/Header.tsx+++ b/frontend/src/metabase/visualizer/components/Header/Header.tsx@@ -97,10 +97,7 @@ export function Header({disabled={!canUndo}onClick={undo}leftSection={- <Icon- name="undo"- color={canUndo ? "unset" : "var(--mb-color-text-light)"}- />+ <Icon name="undo" c={canUndo ? "none" : "text-tertiary"} />}/></Tooltip>@@ -111,10 +108,7 @@ export function Header({disabled={!canRedo}onClick={redo}leftSection={- <Icon- name="redo"- color={canRedo ? "unset" : "var(--mb-color-text-light)"}- />+ <Icon name="redo" c={canRedo ? "unset" : "text-tertiary"} />}/></Tooltip>diff --git a/frontend/src/metabase/visualizer/components/VisualizationCanvas/VisualizationCanvas.module.css b/frontend/src/metabase/visualizer/components/VisualizationCanvas/VisualizationCanvas.module.cssindex 6f4a19c4e55..6c03e8b32a2 100644--- a/frontend/src/metabase/visualizer/components/VisualizationCanvas/VisualizationCanvas.module.css+++ b/frontend/src/metabase/visualizer/components/VisualizationCanvas/VisualizationCanvas.module.css@@ -15,7 +15,7 @@pointer-events: none;position: absolute;inset: 0;- background-color: var(--mb-color-text-white-alpha-85);+ background-color: var(--mb-color-text-primary-inverse);opacity: 0;transition: opacity 0.2s ease-in-out;@@ -29,8 +29,8 @@margin: auto;width: 64px;height: 64px;- background-color: var(--mb-color-background-inverse);+ background-color: var(--mb-color-background-primary-inverse);border-radius: 8px;- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);}}diff --git a/frontend/src/metabase/visualizer/components/VisualizationCanvas/VisualizationCanvas.tsx b/frontend/src/metabase/visualizer/components/VisualizationCanvas/VisualizationCanvas.tsxindex 3fde7952592..8a013a35e2b 100644--- a/frontend/src/metabase/visualizer/components/VisualizationCanvas/VisualizationCanvas.tsx+++ b/frontend/src/metabase/visualizer/components/VisualizationCanvas/VisualizationCanvas.tsx@@ -70,10 +70,13 @@ export function VisualizationCanvas({ className }: VisualizationCanvasProps) {<Center h="100%" w="100%" mx="auto" className={className}><Flex direction="column" align="center" gap={12}><Image src={metabot} mb={10} h={96} w={96} />- <Title size="h3" c="text">{t`Start by selecting a dataset`}</Title>+ <Title+ size="h3"+ c="text-primary"+ >{t`Start by selecting a dataset`}</Title><Titlesize="h5"- c="text-light"+ c="text-tertiary">{t`Find something to visualize in the column on the left.`}</Title></Flex></Center>diff --git a/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/HorizontalWell/FunnelHorizontalWell.tsx b/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/HorizontalWell/FunnelHorizontalWell.tsxindex 2378cfdbcff..c6c449127bd 100644--- a/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/HorizontalWell/FunnelHorizontalWell.tsx+++ b/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/HorizontalWell/FunnelHorizontalWell.tsx@@ -147,7 +147,7 @@ function FunnelWellItem({const box = (<WellItem{...props}- bg={isDraggable ? "var(--mb-color-bg-white)" : "transparent"}+ bg={isDraggable ? "background-primary" : "transparent"}style={{cursor: isDraggable ? "grab" : "default",}}diff --git a/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/ScatterFloatingWell/ScatterFloatingWell.tsx b/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/ScatterFloatingWell/ScatterFloatingWell.tsxindex 03d62a987b8..5adf24cb5ea 100644--- a/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/ScatterFloatingWell/ScatterFloatingWell.tsx+++ b/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/ScatterFloatingWell/ScatterFloatingWell.tsx@@ -59,7 +59,7 @@ export function ScatterFloatingWell() {</Text></WellItem>) : (- <Text c="text-light" ta="center">{t`Bubble size`}</Text>+ <Text c="text-tertiary" ta="center">{t`Bubble size`}</Text>)}</Box>);diff --git a/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/WellItem.tsx b/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/WellItem.tsxindex 761df189855..340d802a059 100644--- a/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/WellItem.tsx+++ b/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/WellItem.tsx@@ -19,7 +19,7 @@ export const WellItem = forwardRef<HTMLDivElement, WellItemProps>(<Flexdirection="row"align="center"- bg="var(--mb-color-bg-white)"+ bg="background-primary"px="sm"data-testid="well-item"{...props}@@ -35,7 +35,7 @@ export const WellItem = forwardRef<HTMLDivElement, WellItemProps>(border: "2px solid var(--mb-color-brand)",boxShadow: "0px 1px 4px 1px var(--mb-color-shadow)",cursor: "grab",- backgroundColor: "var(--mb-color-bg-light)",+ backgroundColor: "var(--mb-color-background-secondary)",borderRadius: "var(--border-radius-xl)",}: {}),diff --git a/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/well.module.css b/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/well.module.cssindex b56b8999aae..1056ac7d3d1 100644--- a/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/well.module.css+++ b/frontend/src/metabase/visualizer/components/VisualizationCanvas/wells/well.module.css@@ -1,6 +1,6 @@.Well {flex-wrap: nowrap;- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);padding: var(--mantine-spacing-sm);gap: var(--mantine-spacing-sm);border-radius: var(--border-radius-xl);diff --git a/frontend/src/metabase/visualizer/components/VisualizationPicker/VisualizationPicker.module.css b/frontend/src/metabase/visualizer/components/VisualizationPicker/VisualizationPicker.module.cssindex 07b0961ff03..8f27d1442e3 100644--- a/frontend/src/metabase/visualizer/components/VisualizationPicker/VisualizationPicker.module.css+++ b/frontend/src/metabase/visualizer/components/VisualizationPicker/VisualizationPicker.module.css@@ -1,9 +1,9 @@.ListItem[aria-selected="true"] {background-color: var(--mb-color-brand);- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);.ListItemLabel {- color: var(--mb-color-text-white);+ color: var(--mb-color-text-primary-inverse);}&:hover {diff --git a/frontend/src/metabase/visualizer/components/Visualizer/Visualizer.module.css b/frontend/src/metabase/visualizer/components/Visualizer/Visualizer.module.cssindex 40cb46ce608..fc3a7ebb2b0 100644--- a/frontend/src/metabase/visualizer/components/Visualizer/Visualizer.module.css+++ b/frontend/src/metabase/visualizer/components/Visualizer/Visualizer.module.css@@ -35,7 +35,7 @@transition: var(--transition-duration);grid-area: dataSidebar;min-width: 0;- background-color: var(--mb-color-bg-light);+ background-color: var(--mb-color-background-secondary);}.dataSidebarContent {diff --git a/resources/frontend_client/app/assets/img/metabot-shades.svg b/resources/frontend_client/app/assets/img/metabot-shades.svgindex a9cf2c2724b..8df87fe33dd 100644--- a/resources/frontend_client/app/assets/img/metabot-shades.svg+++ b/resources/frontend_client/app/assets/img/metabot-shades.svg@@ -16,7 +16,7 @@<defs><linearGradient id="paint0_linear_4_66" x1="42.75" y1="3" x2="42.75" y2="25.538" gradientUnits="userSpaceOnUse"><stop stop-color="var(--metabot-outline)"/>-<stop offset="1" stop-color="var(--mb-color-bg-light)"/>+<stop offset="1" stop-color="var(--mb-color-background-secondary)"/></linearGradient></defs></svg>