From d921742d3e746758036ec36e5ba69b8e450164d0 Mon Sep 17 00:00:00 2001 From: Martin <2026226+martin-mfg@users.noreply.github.com> Date: Sat, 7 Mar 2026 12:54:33 +0100 Subject: [PATCH] merge upstream `next` branch (#121) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: ricountzero --- apps/backend/src/cards/top-languages.js | 8 +++----- apps/backend/src/common/color.js | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/apps/backend/src/cards/top-languages.js b/apps/backend/src/cards/top-languages.js index 8955d653..85739c46 100644 --- a/apps/backend/src/cards/top-languages.js +++ b/apps/backend/src/cards/top-languages.js @@ -2,7 +2,7 @@ import { Card } from "../common/Card.js"; import { I18n } from "../common/I18n.js"; -import { getCardColors } from "../common/color.js"; +import { fallbackColor, getCardColors } from "../common/color.js"; import { formatBytes } from "../common/fmt.js"; import { chunkArray, clampValue, lowercaseTrim } from "../common/ops.js"; import { @@ -252,9 +252,7 @@ const createProgressTextNode = ({ color, width: progressWidth, progress, - progressBarBackgroundColor: progBarBgColor - ? `#${progBarBgColor}` - : "#ddd", + progressBarBackgroundColor: progBarBgColor, delay: staggerDelay + 300, })} @@ -885,7 +883,7 @@ const renderTopLanguages = (topLangs, options = {}) => { langs, width, totalLanguageSize, - prog_bar_bg_color, + fallbackColor(prog_bar_bg_color, "#ddd"), stats_format, ); } diff --git a/apps/backend/src/common/color.js b/apps/backend/src/common/color.js index fbbf0423..622ed161 100644 --- a/apps/backend/src/common/color.js +++ b/apps/backend/src/common/color.js @@ -142,4 +142,4 @@ const getCardColors = ({ return { titleColor, iconColor, textColor, bgColor, borderColor, ringColor }; }; -export { getCardColors }; +export { fallbackColor, getCardColors };