Skip to content

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

updating color for .SecondaryCTALink (#68001)

Nick Fitzpatrickc34013f4ff8b
diff --git a/.loki/reference/chrome_laptop_Design_System_Colors_Default.png b/.loki/reference/chrome_laptop_Design_System_Colors_Default.png
index c07d8bb5f11..33345d3f0a2 100644
Binary files a/.loki/reference/chrome_laptop_Design_System_Colors_Default.png and b/.loki/reference/chrome_laptop_Design_System_Colors_Default.png differ
diff --git a/.loki/reference/chrome_laptop_Patterns_Upsells_Banner_Default.png b/.loki/reference/chrome_laptop_Patterns_Upsells_Banner_Default.png
index 65bf8cb46a0..bc68c1a78be 100644
Binary files a/.loki/reference/chrome_laptop_Patterns_Upsells_Banner_Default.png and b/.loki/reference/chrome_laptop_Patterns_Upsells_Banner_Default.png differ
diff --git a/.loki/reference/chrome_laptop_Patterns_Upsells_Banner_Dismissible.png b/.loki/reference/chrome_laptop_Patterns_Upsells_Banner_Dismissible.png
index c31f9ac522a..ebe9733c675 100644
Binary files a/.loki/reference/chrome_laptop_Patterns_Upsells_Banner_Dismissible.png and b/.loki/reference/chrome_laptop_Patterns_Upsells_Banner_Dismissible.png differ
diff --git a/.loki/reference/chrome_laptop_Patterns_Upsells_Banner_Large.png b/.loki/reference/chrome_laptop_Patterns_Upsells_Banner_Large.png
index c337cd4d6d9..81c1025a5cd 100644
Binary files a/.loki/reference/chrome_laptop_Patterns_Upsells_Banner_Large.png and b/.loki/reference/chrome_laptop_Patterns_Upsells_Banner_Large.png differ
diff --git a/.loki/reference/chrome_laptop_Patterns_Upsells_Banner_Secondary.png b/.loki/reference/chrome_laptop_Patterns_Upsells_Banner_Secondary.png
index c012a9915d9..66aa0783cf7 100644
Binary files a/.loki/reference/chrome_laptop_Patterns_Upsells_Banner_Secondary.png and b/.loki/reference/chrome_laptop_Patterns_Upsells_Banner_Secondary.png differ
diff --git a/.loki/reference/chrome_laptop_Patterns_Upsells_Banner_With_Internal_Link.png b/.loki/reference/chrome_laptop_Patterns_Upsells_Banner_With_Internal_Link.png
index a1f40cdb7a8..a54ee7fcd7c 100644
Binary files a/.loki/reference/chrome_laptop_Patterns_Upsells_Banner_With_Internal_Link.png and b/.loki/reference/chrome_laptop_Patterns_Upsells_Banner_With_Internal_Link.png differ
diff --git a/.loki/reference/chrome_laptop_Patterns_Upsells_Banner_With_On_Click.png b/.loki/reference/chrome_laptop_Patterns_Upsells_Banner_With_On_Click.png
index 65bf8cb46a0..bc68c1a78be 100644
Binary files a/.loki/reference/chrome_laptop_Patterns_Upsells_Banner_With_On_Click.png and b/.loki/reference/chrome_laptop_Patterns_Upsells_Banner_With_On_Click.png differ
diff --git a/.loki/reference/chrome_laptop_Patterns_Upsells_Card_Full_Width_Variant.png b/.loki/reference/chrome_laptop_Patterns_Upsells_Card_Full_Width_Variant.png
index 7e51e343de9..a6d3b2b7e65 100644
Binary files a/.loki/reference/chrome_laptop_Patterns_Upsells_Card_Full_Width_Variant.png and b/.loki/reference/chrome_laptop_Patterns_Upsells_Card_Full_Width_Variant.png differ
diff --git a/.loki/reference/chrome_laptop_Patterns_Upsells_Card_Large_Full_Width_Variant.png b/.loki/reference/chrome_laptop_Patterns_Upsells_Card_Large_Full_Width_Variant.png
index a2a09dfea7d..4e197d5bc0e 100644
Binary files a/.loki/reference/chrome_laptop_Patterns_Upsells_Card_Large_Full_Width_Variant.png and b/.loki/reference/chrome_laptop_Patterns_Upsells_Card_Large_Full_Width_Variant.png differ
diff --git a/.loki/reference/chrome_laptop_Patterns_Upsells_Card_Large_Variant.png b/.loki/reference/chrome_laptop_Patterns_Upsells_Card_Large_Variant.png
index f69af1f9cce..20aa75de3b7 100644
Binary files a/.loki/reference/chrome_laptop_Patterns_Upsells_Card_Large_Variant.png and b/.loki/reference/chrome_laptop_Patterns_Upsells_Card_Large_Variant.png differ
diff --git a/.loki/reference/chrome_laptop_Patterns_Upsells_Card_Max_Width_500_Variant.png b/.loki/reference/chrome_laptop_Patterns_Upsells_Card_Max_Width_500_Variant.png
index 734aded3fa0..198f7bbc8be 100644
Binary files a/.loki/reference/chrome_laptop_Patterns_Upsells_Card_Max_Width_500_Variant.png and b/.loki/reference/chrome_laptop_Patterns_Upsells_Card_Max_Width_500_Variant.png differ
diff --git a/.loki/reference/chrome_laptop_Patterns_Upsells_Card_With_Image.png b/.loki/reference/chrome_laptop_Patterns_Upsells_Card_With_Image.png
index 7e51e343de9..a6d3b2b7e65 100644
Binary files a/.loki/reference/chrome_laptop_Patterns_Upsells_Card_With_Image.png and b/.loki/reference/chrome_laptop_Patterns_Upsells_Card_With_Image.png differ
diff --git a/.loki/reference/chrome_laptop_Patterns_Upsells_Card_With_On_Click.png b/.loki/reference/chrome_laptop_Patterns_Upsells_Card_With_On_Click.png
index d884c00dffb..4bd4100c4c1 100644
Binary files a/.loki/reference/chrome_laptop_Patterns_Upsells_Card_With_On_Click.png and b/.loki/reference/chrome_laptop_Patterns_Upsells_Card_With_On_Click.png differ
diff --git a/.loki/reference/chrome_laptop_Patterns_Upsells_Card_Without_Image.png b/.loki/reference/chrome_laptop_Patterns_Upsells_Card_Without_Image.png
index 652d9ddc74b..261107ad6dd 100644
Binary files a/.loki/reference/chrome_laptop_Patterns_Upsells_Card_Without_Image.png and b/.loki/reference/chrome_laptop_Patterns_Upsells_Card_Without_Image.png differ
diff --git a/.loki/reference/chrome_laptop_Patterns_Upsells_Pill_Default.png b/.loki/reference/chrome_laptop_Patterns_Upsells_Pill_Default.png
index 1450f23191f..690cc45ae10 100644
Binary files a/.loki/reference/chrome_laptop_Patterns_Upsells_Pill_Default.png and b/.loki/reference/chrome_laptop_Patterns_Upsells_Pill_Default.png differ
diff --git a/.loki/reference/chrome_laptop_Patterns_Upsells_Pill_Multiline.png b/.loki/reference/chrome_laptop_Patterns_Upsells_Pill_Multiline.png
index 995921a1dda..328c111f877 100644
Binary files a/.loki/reference/chrome_laptop_Patterns_Upsells_Pill_Multiline.png and b/.loki/reference/chrome_laptop_Patterns_Upsells_Pill_Multiline.png differ
diff --git a/.loki/reference/chrome_laptop_Patterns_Upsells_Pill_With_On_Click.png b/.loki/reference/chrome_laptop_Patterns_Upsells_Pill_With_On_Click.png
index 1450f23191f..690cc45ae10 100644
Binary files a/.loki/reference/chrome_laptop_Patterns_Upsells_Pill_With_On_Click.png and b/.loki/reference/chrome_laptop_Patterns_Upsells_Pill_With_On_Click.png differ
diff --git a/.loki/reference/chrome_laptop_Patterns_Upsells_UpsellCta_Cta_Button.png b/.loki/reference/chrome_laptop_Patterns_Upsells_UpsellCta_Cta_Button.png
index e11dc1073ce..d19b5291058 100644
Binary files a/.loki/reference/chrome_laptop_Patterns_Upsells_UpsellCta_Cta_Button.png and b/.loki/reference/chrome_laptop_Patterns_Upsells_UpsellCta_Cta_Button.png differ
diff --git a/.loki/reference/chrome_laptop_Patterns_Upsells_UpsellCta_Cta_Button_Large.png b/.loki/reference/chrome_laptop_Patterns_Upsells_UpsellCta_Cta_Button_Large.png
index 3fadc5e6dee..86f9db30941 100644
Binary files a/.loki/reference/chrome_laptop_Patterns_Upsells_UpsellCta_Cta_Button_Large.png and b/.loki/reference/chrome_laptop_Patterns_Upsells_UpsellCta_Cta_Button_Large.png differ
diff --git a/.loki/reference/chrome_laptop_Patterns_Upsells_UpsellCta_Cta_External_Link.png b/.loki/reference/chrome_laptop_Patterns_Upsells_UpsellCta_Cta_External_Link.png
index 76579839dd0..d4e4c560551 100644
Binary files a/.loki/reference/chrome_laptop_Patterns_Upsells_UpsellCta_Cta_External_Link.png and b/.loki/reference/chrome_laptop_Patterns_Upsells_UpsellCta_Cta_External_Link.png differ
diff --git a/.loki/reference/chrome_laptop_Patterns_Upsells_UpsellCta_Cta_Internal_Link.png b/.loki/reference/chrome_laptop_Patterns_Upsells_UpsellCta_Cta_Internal_Link.png
index 76579839dd0..d4e4c560551 100644
Binary files a/.loki/reference/chrome_laptop_Patterns_Upsells_UpsellCta_Cta_Internal_Link.png and b/.loki/reference/chrome_laptop_Patterns_Upsells_UpsellCta_Cta_Internal_Link.png differ
diff --git a/frontend/src/metabase/admin/upsells/components/UpsellBanner.module.css b/frontend/src/metabase/admin/upsells/components/UpsellBanner.module.css
index 2988c371ba6..4709d663b10 100644
--- a/frontend/src/metabase/admin/upsells/components/UpsellBanner.module.css
+++ b/frontend/src/metabase/admin/upsells/components/UpsellBanner.module.css
@@ -1,5 +1,3 @@
-@import "./Upsells.base.module.css";
-
.UpsellBannerComponent {
display: flex;
align-items: center;
diff --git a/frontend/src/metabase/admin/upsells/components/UpsellCta.module.css b/frontend/src/metabase/admin/upsells/components/UpsellCta.module.css
index 093c946701c..7328c7107eb 100644
--- a/frontend/src/metabase/admin/upsells/components/UpsellCta.module.css
+++ b/frontend/src/metabase/admin/upsells/components/UpsellCta.module.css
@@ -1,5 +1,3 @@
-@import "./Upsells.base.module.css";
-
.UpsellCTALink {
white-space: nowrap;
display: flex;
@@ -10,15 +8,14 @@
font-weight: bold;
font-size: 0.75rem;
padding: 0.25rem 0.5rem;
- border-radius: 2rem;
- color: var(--mb-color-upsell-primary);
- background-color: var(--mb-color-upsell-secondary);
+ border-radius: 0.5rem;
+ color: var(--mb-color-text-primary-inverse);
+ background-color: var(--mb-color-metabase-brand);
text-decoration: none;
cursor: pointer;
&:hover {
- background-color: var(--mb-color-upsell-primary);
- color: var(--mb-color-upsell-text-hover);
+ background-color: var(--mb-color-metabase-brand-hover);
}
&.Medium {
diff --git a/frontend/src/metabase/admin/upsells/components/UpsellGem.module.css b/frontend/src/metabase/admin/upsells/components/UpsellGem.module.css
index 7499420ffd3..afd04bc4ccb 100644
--- a/frontend/src/metabase/admin/upsells/components/UpsellGem.module.css
+++ b/frontend/src/metabase/admin/upsells/components/UpsellGem.module.css
@@ -1,5 +1,3 @@
-@import "./Upsells.base.module.css";
-
.UpsellGem {
color: var(--mb-color-upsell-gem);
flex-shrink: 0;
diff --git a/frontend/src/metabase/admin/upsells/components/UpsellPill.module.css b/frontend/src/metabase/admin/upsells/components/UpsellPill.module.css
index b1cc758eb58..6081750066d 100644
--- a/frontend/src/metabase/admin/upsells/components/UpsellPill.module.css
+++ b/frontend/src/metabase/admin/upsells/components/UpsellPill.module.css
@@ -1,5 +1,3 @@
-@import "./Upsells.base.module.css";
-
.UpsellPillComponent {
display: inline-flex;
gap: 0.5rem;
@@ -16,8 +14,8 @@
cursor: pointer;
&:hover {
- background-color: var(--mb-color-upsell-primary);
- color: var(--mb-color-text-primary-inverse);
+ background-color: var(--mb-color-upsell-secondary);
+ color: var(--mb-color-text-primary);
border: 1px solid var(--mb-color-upsell-primary);
}
}
diff --git a/frontend/src/metabase/admin/upsells/components/Upsells.base.module.css b/frontend/src/metabase/admin/upsells/components/Upsells.base.module.css
deleted file mode 100644
index 9d5d61f87de..00000000000
--- a/frontend/src/metabase/admin/upsells/components/Upsells.base.module.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * The upsell color palette is designed to function in harmony with the original Metabase set of Blues, Grays and Purples
- * but with a twist. All three colors are new and should not be used elsewhere in the product experience.
- */
-:root {
- --mb-color-upsell-primary: #005999;
- --mb-color-upsell-secondary: #bff4ff;
- --mb-color-upsell-gem: #00d4ff;
- --mb-color-upsell-text-hover: #fff;
-}
diff --git a/frontend/src/metabase/admin/upsells/components/Upsells.module.css b/frontend/src/metabase/admin/upsells/components/Upsells.module.css
index 587c2eb6981..e1f30e2e6ee 100644
--- a/frontend/src/metabase/admin/upsells/components/Upsells.module.css
+++ b/frontend/src/metabase/admin/upsells/components/Upsells.module.css
@@ -1,8 +1,6 @@
-@import "./Upsells.base.module.css";
-
.SecondaryCTALink {
display: inline;
- color: var(--mb-color-upsell-primary);
+ color: var(--mb-color-metabase-brand);
font-weight: 700;
margin-left: 0.25rem;
}
diff --git a/frontend/src/metabase/common/components/UpsellCard/UpsellCard.module.css b/frontend/src/metabase/common/components/UpsellCard/UpsellCard.module.css
index 3aff057865e..8b8384d3f08 100644
--- a/frontend/src/metabase/common/components/UpsellCard/UpsellCard.module.css
+++ b/frontend/src/metabase/common/components/UpsellCard/UpsellCard.module.css
@@ -1,4 +1,4 @@
-@import "../../../admin/upsells/components/Upsells.base.module.css";
+/* @import "../../../admin/upsells/components/Upsells.base.module.css"; */
.UpsellCardComponent {
border-radius: 0.5rem;
diff --git a/frontend/src/metabase/lib/colors/constants/themes/dark.ts b/frontend/src/metabase/lib/colors/constants/themes/dark.ts
index 23b37be8a75..3aba8f7cd47 100644
--- a/frontend/src/metabase/lib/colors/constants/themes/dark.ts
+++ b/frontend/src/metabase/lib/colors/constants/themes/dark.ts
@@ -47,6 +47,7 @@ export const METABASE_DARK_THEME: MetabaseThemeV2 = {
"illustration-brand-secondary": baseColors.brand[80],
"illustration-brand-tertiary": baseColors.brand[90],
"metabase-brand": baseColors.blue[40],
+ "metabase-brand-hover": baseColors.blue[50],
"saturated-blue": baseColors.ocean[40],
"saturated-green": baseColors.palm[40],
"saturated-purple": baseColors.octopus[40],
@@ -86,5 +87,8 @@ export const METABASE_DARK_THEME: MetabaseThemeV2 = {
bronze: "#CD7F32",
silver: "#C0C0C0",
gold: "#FFD700",
+ "upsell-primary": baseColors.ocean[30],
+ "upsell-secondary": baseColors.ocean[80],
+ "upsell-gem": "#00d4ff",
},
};
diff --git a/frontend/src/metabase/lib/colors/constants/themes/light.ts b/frontend/src/metabase/lib/colors/constants/themes/light.ts
index 032fc8df314..3f7831428cf 100644
--- a/frontend/src/metabase/lib/colors/constants/themes/light.ts
+++ b/frontend/src/metabase/lib/colors/constants/themes/light.ts
@@ -47,6 +47,7 @@ export const METABASE_LIGHT_THEME: MetabaseThemeV2 = {
"illustration-brand-secondary": baseColors.brand[10],
"illustration-brand-tertiary": baseColors.brand[5],
"metabase-brand": baseColors.blue[40],
+ "metabase-brand-hover": baseColors.blue[30],
"saturated-blue": baseColors.ocean[60],
"saturated-green": baseColors.palm[60],
"saturated-purple": baseColors.octopus[60],
@@ -86,5 +87,8 @@ export const METABASE_LIGHT_THEME: MetabaseThemeV2 = {
bronze: "#CD7F32",
silver: "#C0C0C0",
gold: "#FFD700",
+ "upsell-primary": baseColors.ocean[70],
+ "upsell-secondary": baseColors.ocean[20],
+ "upsell-gem": "#00d4ff",
},
};
diff --git a/frontend/src/metabase/lib/colors/types/color-keys.ts b/frontend/src/metabase/lib/colors/types/color-keys.ts
index 7dffc7a9fc1..7092e4e6297 100644
--- a/frontend/src/metabase/lib/colors/types/color-keys.ts
+++ b/frontend/src/metabase/lib/colors/types/color-keys.ts
@@ -91,9 +91,13 @@ export type MetabaseAccentColorKey = (typeof ALL_ACCENT_COLOR_NAMES)[number];
*/
export type ProtectedColorKey =
| "metabase-brand"
+ | "metabase-brand-hover"
| "admin-navbar"
| "admin-navbar-secondary"
| "admin-navbar-inverse"
+ | "upsell-primary"
+ | "upsell-secondary"
+ | "upsell-gem"
| "accent0"
| "accent1"
| "accent2"