From 17b82be1a4d08d010ed060575e0b00ab335cdd57 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Tue, 5 May 2026 19:49:32 +0300 Subject: [PATCH] make danger buttons less obnoxious --- src/components/button.style.js | 2 +- src/services/theme_data/theme_data_3.service.js | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/components/button.style.js b/src/components/button.style.js index 3fb308b89..1644accc4 100644 --- a/src/components/button.style.js +++ b/src/components/button.style.js @@ -54,7 +54,7 @@ export default { { variant: 'danger', directives: { - background: '--cRed', + background: '$blend(--cRed 0.25 --inheritedBackground)', }, }, { diff --git a/src/services/theme_data/theme_data_3.service.js b/src/services/theme_data/theme_data_3.service.js index 533972a13..7babbaf32 100644 --- a/src/services/theme_data/theme_data_3.service.js +++ b/src/services/theme_data/theme_data_3.service.js @@ -499,7 +499,12 @@ export const init = ({ }), ) const lastVariantRule = variantRules[variantRules.length - 1] - if (lastVariantRule) { + const lastVariantSelector = ruleToSelector( + lastVariantRule, + true, + ) + + if (lastVariantRule && lastVariantSelector !== selector) { inheritRule = lastVariantRule } else { const normalRules = ruleset.filter(