Skip to content

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

refactor: Migrate icon tokens (disabled/secondary swap) (#76792)

Oleh K132a7e674adf
diff --git a/.loki/reference/chrome_laptop_Design_System_Colors_Default.png b/.loki/reference/chrome_laptop_Design_System_Colors_Default.png
index c4b977b97e8..8b1fcf30088 100644
Binary files a/.loki/reference/chrome_laptop_Design_System_Colors_Default.png and b/.loki/reference/chrome_laptop_Design_System_Colors_Default.png differ
diff --git a/.loki/reference/chrome_laptop_EmbeddingSDK_SdkQuestion_ChartTypeDropdownInner_Question_Chart_Type_Selector_List.png b/.loki/reference/chrome_laptop_EmbeddingSDK_SdkQuestion_ChartTypeDropdownInner_Question_Chart_Type_Selector_List.png
deleted file mode 100644
index f8cc8cab8ac..00000000000
Binary files a/.loki/reference/chrome_laptop_EmbeddingSDK_SdkQuestion_ChartTypeDropdownInner_Question_Chart_Type_Selector_List.png and /dev/null differ
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableOverviewPage/TableOverview/DescriptionSection/DescriptionSection.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableOverviewPage/TableOverview/DescriptionSection/DescriptionSection.tsx
index 752b12ee333..342b3ea4dc5 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableOverviewPage/TableOverview/DescriptionSection/DescriptionSection.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/pages/TableOverviewPage/TableOverview/DescriptionSection/DescriptionSection.tsx
@@ -222,7 +222,7 @@ export function DescriptionSection({ table }: DescriptionSectionProps) {
<Group gap="sm" mb={4}>
<Icon
name="refresh_downstream"
- c={table.data_source ? "core-brand" : "icon-secondary"}
+ c={table.data_source ? "core-brand" : "icon-disabled"}
/>
<DataSourceInput
@@ -249,7 +249,7 @@ export function DescriptionSection({ table }: DescriptionSectionProps) {
<Group gap="sm" mb={4}>
<Icon
name="person"
- c={isOwnerSpecified ? "core-brand" : "icon-secondary"}
+ c={isOwnerSpecified ? "core-brand" : "icon-disabled"}
/>
<UserInput
diff --git a/enterprise/frontend/src/metabase-enterprise/replacement/components/SourceReplacementModal/ModalBody/EmptyState/EmptyState.tsx b/enterprise/frontend/src/metabase-enterprise/replacement/components/SourceReplacementModal/ModalBody/EmptyState/EmptyState.tsx
index 921de8a0ccb..b9cf701cbeb 100644
--- a/enterprise/frontend/src/metabase-enterprise/replacement/components/SourceReplacementModal/ModalBody/EmptyState/EmptyState.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/replacement/components/SourceReplacementModal/ModalBody/EmptyState/EmptyState.tsx
@@ -7,7 +7,7 @@ export function EmptyState() {
<Center flex={1}>
<Stack align="center" gap="xl">
<Center w="5rem" h="5rem" bg="background_surface-disabled" bdrs="50%">
- <FixedSizeIcon name="list" c="icon-disabled" />
+ <FixedSizeIcon name="list" c="icon-secondary" />
</Center>
<Text ta="center">{t`The items that will be affected will show up here.`}</Text>
</Stack>
diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/AddSectionButton/AddSectionButton.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/AddSectionButton/AddSectionButton.tsx
index ac0d3cf94d2..eddbd5e5295 100644
--- a/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/AddSectionButton/AddSectionButton.tsx
+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/buttons/AddSectionButton/AddSectionButton.tsx
@@ -45,7 +45,7 @@ export const AddSectionButton = () => {
{layoutOptions.map((layout) => (
<Menu.Item
key={layout.id}
- bg="icon-secondary"
+ bg="icon-disabled"
onClick={() => onAddSection(layout)}
aria-label={layout.label}
p="14px"
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricExpressionPill/MetricExpressionPill.tsx b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricExpressionPill/MetricExpressionPill.tsx
index 07fbbe13b85..9e04164f206 100644
--- a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricExpressionPill/MetricExpressionPill.tsx
+++ b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricExpressionPill/MetricExpressionPill.tsx
@@ -114,7 +114,7 @@ export function MetricExpressionPill({
>
<Flex align="center" gap="xs">
<SourceColorIndicator
- colors={isDisabled ? ["var(--mb-color-icon-disabled)"] : colors}
+ colors={isDisabled ? ["var(--mb-color-icon-secondary)"] : colors}
/>
{isRenaming ? (
<EditableText
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricPill/MetricPill.tsx b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricPill/MetricPill.tsx
index bb87bc70634..7efb253b8ef 100644
--- a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricPill/MetricPill.tsx
+++ b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricPill/MetricPill.tsx
@@ -151,7 +151,7 @@ export function MetricPill({
<>
<SourceColorIndicator
colors={
- isDisabled ? ["var(--mb-color-icon-disabled)"] : colors
+ isDisabled ? ["var(--mb-color-icon-secondary)"] : colors
}
fallbackIcon={
metric.sourceType === "measure" ? "ruler" : "metric"
diff --git a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchInput/MetricSearchInput.unit.spec.tsx b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchInput/MetricSearchInput.unit.spec.tsx
index 00478faf661..b6196498396 100644
--- a/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchInput/MetricSearchInput.unit.spec.tsx
+++ b/frontend/src/metabase/metrics-viewer/components/MetricSearch/MetricSearchInput/MetricSearchInput.unit.spec.tsx
@@ -238,7 +238,7 @@ describe("collapsed view (definitions present, not focused)", () => {
const indicators = screen.getAllByTestId("color-indicator-container");
expect(
within(indicators[1]).getByRole("img", { hidden: true }),
- ).toHaveStyle({ color: "var(--mb-color-icon-disabled)" });
+ ).toHaveStyle({ color: "var(--mb-color-icon-secondary)" });
});
it("does not render a text input when collapsed", () => {
diff --git a/frontend/src/metabase/ui/colors/constants/themes/dark.ts b/frontend/src/metabase/ui/colors/constants/themes/dark.ts
index d28589b3a87..8088eaaeedd 100644
--- a/frontend/src/metabase/ui/colors/constants/themes/dark.ts
+++ b/frontend/src/metabase/ui/colors/constants/themes/dark.ts
@@ -38,10 +38,10 @@ const deprecatedColors = {
error: baseColors.lobster[50],
filter: baseColors.octopus[40],
focus: baseColors.blue[70],
- "icon-brand": baseColors.brand[40],
- "icon-primary": baseColors.orionAlphaInverse[80],
- "icon-disabled": baseColors.orionAlphaInverse[30],
- "icon-secondary": baseColors.orionAlphaInverse[50],
+ "icon-brand": "var(--mb-color-text-brand)",
+ "icon-primary": "var(--mb-color-text-primary)",
+ "icon-disabled": "var(--mb-color-text-disabled)",
+ "icon-secondary": "var(--mb-color-text-secondary)",
"illustration-brand-secondary": baseColors.brand[80],
"illustration-brand-tertiary": baseColors.brand[90],
"metabase-brand": baseColors.blue[40],
diff --git a/frontend/src/metabase/ui/colors/constants/themes/light.ts b/frontend/src/metabase/ui/colors/constants/themes/light.ts
index 71b7088a3a9..53fac1d7f55 100644
--- a/frontend/src/metabase/ui/colors/constants/themes/light.ts
+++ b/frontend/src/metabase/ui/colors/constants/themes/light.ts
@@ -38,10 +38,10 @@ const deprecatedColors = {
error: baseColors.lobster[50],
filter: baseColors.octopus[50],
focus: baseColors.blue[20],
- "icon-brand": baseColors.brand[40],
- "icon-primary": baseColors.orionAlpha[80],
- "icon-disabled": baseColors.orionAlpha[30],
- "icon-secondary": baseColors.orionAlpha[50],
+ "icon-brand": "var(--mb-color-text-brand)",
+ "icon-primary": "var(--mb-color-text-primary)",
+ "icon-disabled": "var(--mb-color-text-disabled)",
+ "icon-secondary": "var(--mb-color-text-secondary)",
"illustration-brand-secondary": baseColors.brand[10],
"illustration-brand-tertiary": baseColors.brand[5],
"metabase-brand": baseColors.blue[40],
diff --git a/frontend/src/metabase/ui/components/navigation/Breadcrumbs/Breadcrumbs.module.css b/frontend/src/metabase/ui/components/navigation/Breadcrumbs/Breadcrumbs.module.css
index 735d378fb28..cb7743b16db 100644
--- a/frontend/src/metabase/ui/components/navigation/Breadcrumbs/Breadcrumbs.module.css
+++ b/frontend/src/metabase/ui/components/navigation/Breadcrumbs/Breadcrumbs.module.css
@@ -1,3 +1,3 @@
.separator {
- color: var(--mb-color-icon-secondary);
+ color: var(--mb-color-icon-disabled);
}