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
Use non-whitelabeled blue color for Metabase logo (#64524)
Phoomparin Manocc2991b4b312
diff --git a/enterprise/frontend/src/embedding-sdk-bundle/components/private/SdkUsageProblem/SdkUsageProblemBanner.tsx b/enterprise/frontend/src/embedding-sdk-bundle/components/private/SdkUsageProblem/SdkUsageProblemBanner.tsxindex e9ddd605ee7..4a630cdb487 100644--- a/enterprise/frontend/src/embedding-sdk-bundle/components/private/SdkUsageProblem/SdkUsageProblemBanner.tsx+++ b/enterprise/frontend/src/embedding-sdk-bundle/components/private/SdkUsageProblem/SdkUsageProblemBanner.tsx@@ -8,7 +8,7 @@ import { useSdkDispatch } from "embedding-sdk-bundle/store";import { setUsageProblem } from "embedding-sdk-bundle/store/reducer";import type { SdkUsageProblem } from "embedding-sdk-bundle/types/usage-problem";import ExternalLink from "metabase/common/components/ExternalLink";-import LogoIcon from "metabase/common/components/LogoIcon";+import MetabaseLogo from "metabase/common/components/LogoIcon";import { originalColors } from "metabase/lib/colors";import { Button, Card, Flex, Icon, Popover, Stack, Text } from "metabase/ui";@@ -20,7 +20,6 @@ export interface SdkUsageProblemBannerProps {// Prevent the usage problem banner from inheriting the theme colors,// so they remain legible even when the theme is changed.-const unthemedBrand = originalColors["brand"];const unthemedTextDark = originalColors["text-dark"];export const SdkUsageProblemBanner = ({@@ -60,7 +59,7 @@ export const SdkUsageProblemBanner = ({i-should-be-flex="true"><Flex bg="white" px="sm" className={S.Logo} align="center">- <LogoIcon height={24} fill={unthemedBrand} />+ <MetabaseLogo height={24} /></Flex><Flex justify="center" align="center" className={S.Content}>diff --git a/enterprise/frontend/src/metabase-enterprise/settings/selectors.ts b/enterprise/frontend/src/metabase-enterprise/settings/selectors.tsindex b171aed83a6..86dbfaaaba3 100644--- a/enterprise/frontend/src/metabase-enterprise/settings/selectors.ts+++ b/enterprise/frontend/src/metabase-enterprise/settings/selectors.ts@@ -23,6 +23,9 @@ const getCustomLogoUrl = (settingValues: EnterpriseSettings) => {export const getLogoUrl = (state: EnterpriseState) =>getCustomLogoUrl(getSettings(state));+export const getIsDefaultMetabaseLogo = (state: EnterpriseState) =>+ getLogoUrl(state) === DEFAULT_LOGO_URL;+export const getLoadingMessage = (state: EnterpriseState) => {const setting = getSetting(state, "loading-message");// default to empty string to account for a historical bug where thediff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/LogoIcon.jsx b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/LogoIcon.jsxindex ad8b3ede754..2ff450083fe 100644--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/LogoIcon.jsx+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/LogoIcon.jsx@@ -6,10 +6,14 @@ import { Component } from "react";import CS from "metabase/css/core/index.css";import { parseDataUri, removeAllChildren } from "metabase/lib/dom";import { connect } from "metabase/lib/redux";-import { getLogoUrl } from "metabase-enterprise/settings/selectors";+import {+ getIsDefaultMetabaseLogo,+ getLogoUrl,+} from "metabase-enterprise/settings/selectors";const mapStateToProps = (state) => ({url: getLogoUrl(state),+ isDefaultMetabaseLogo: getIsDefaultMetabaseLogo(state),});class LogoIcon extends Component {@@ -120,7 +124,13 @@ class LogoIcon extends Component {}render() {- const { dark, style = {}, height, className } = this.props;+ const {+ dark,+ style = {},+ height,+ className,+ isDefaultMetabaseLogo,+ } = this.props;return (<span@@ -128,7 +138,11 @@ class LogoIcon extends Component {className={cx("Icon",CS.textCentered,- { [CS.textBrand]: !dark },+ // If using the Metabase logo, use the non-whitelabeled Metabase brand color.+ {+ [isDefaultMetabaseLogo ? CS.textMetabaseBrand : CS.textBrand]:+ !dark,+ },{ [CS.textWhite]: dark },className,)}diff --git a/frontend/src/metabase/common/components/LogoIcon/LogoIcon.jsx b/frontend/src/metabase/common/components/LogoIcon/LogoIcon.jsxindex 3fb556c01a3..04e2ec5a77d 100644--- a/frontend/src/metabase/common/components/LogoIcon/LogoIcon.jsx+++ b/frontend/src/metabase/common/components/LogoIcon/LogoIcon.jsx@@ -22,7 +22,7 @@ export class DefaultLogoIcon extends Component {<svgclassName={cx("Icon",- { [CS.textBrand]: !dark },+ { [CS.textMetabaseBrand]: !dark },{ [CS.textWhite]: dark },)}viewBox="0 0 212 256"diff --git a/frontend/src/metabase/css/core/colors.module.css b/frontend/src/metabase/css/core/colors.module.cssindex 168dbfc1871..9b47e0f1d61 100644--- a/frontend/src/metabase/css/core/colors.module.css+++ b/frontend/src/metabase/css/core/colors.module.css@@ -29,6 +29,11 @@color: var(--mb-color-brand);}+/** Non-whitelabeled Metabase brand color */+.textMetabaseBrand {+ color: var(--mb-color-metabase-brand);+}+.textSuccess {color: var(--mb-color-success);}diff --git a/frontend/src/metabase/embedding-sdk/theme/embedding-color-palette.ts b/frontend/src/metabase/embedding-sdk/theme/embedding-color-palette.tsindex f7b8599f90f..ad2eb7c8753 100644--- a/frontend/src/metabase/embedding-sdk/theme/embedding-color-palette.ts+++ b/frontend/src/metabase/embedding-sdk/theme/embedding-color-palette.ts@@ -65,6 +65,14 @@ export const SDK_TO_MAIN_APP_COLORS_MAPPING: Record<"text-hover": ["text-hover"],};+/**+ * 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_TO_MAIN_APP_TOOLTIP_COLORS_MAPPING: Record<keyof NonNullable<MetabaseComponentTheme["tooltip"]>,ColorNamediff --git a/frontend/src/metabase/styled-components/theme/css-variables.ts b/frontend/src/metabase/styled-components/theme/css-variables.tsindex 772810182ef..b0090f0959f 100644--- a/frontend/src/metabase/styled-components/theme/css-variables.ts+++ b/frontend/src/metabase/styled-components/theme/css-variables.ts@@ -7,6 +7,7 @@ import { getDynamicCssVariables } from "metabase/embedding-sdk/theme/dynamic-cssimport {SDK_TO_MAIN_APP_COLORS_MAPPING,SDK_TO_MAIN_APP_TOOLTIP_COLORS_MAPPING,+ SDK_UNCHANGEABLE_COLORS,} from "metabase/embedding-sdk/theme/embedding-color-palette";import { colorConfig } from "metabase/lib/colors";import type { ColorName } from "metabase/lib/colors/types";@@ -80,6 +81,9 @@ function getSdkDesignSystemCssVariables(theme: MantineTheme) {${Object.entries(SDK_TO_MAIN_APP_TOOLTIP_COLORS_MAPPING).flatMap(([, colorName]) => createSdkColorVars(colorName),)}++ /* Colors that cannot be changed. */+ ${SDK_UNCHANGEABLE_COLORS.map((colorName) => createSdkColorVars(colorName))}`;}