From d865f1c3976e98123c7e38786c5bf61514fc28c8 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 13 Mar 2025 10:41:49 +0100 Subject: [PATCH] [IMP] runbot_merge: reset the reset THe bootstra-review-frontend resets text colors in an undesirable manner, override the mixin to remove that crap. Also add a few comments in case this needs to be further tuned in the future. Part of #1088 --- runbot_merge/static/scss/primary_variables.scss | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/runbot_merge/static/scss/primary_variables.scss b/runbot_merge/static/scss/primary_variables.scss index 8b1c999e..671c285d 100644 --- a/runbot_merge/static/scss/primary_variables.scss +++ b/runbot_merge/static/scss/primary_variables.scss @@ -64,13 +64,25 @@ $border-radius: 0.25rem; // // Update rgba-css-var to reference target-suffixed vars (e.g. -bg, -text) but // fallback to the un-suffixed vars if necessary. +// +// Affects utilities-text-color, which affects $utilities[color]([values]), +// which is then used to define the `.text-#{$category}` in +// boostrap/scss/mixin/_utilities.scss +// note: can use (map|deep)-merge to update $utilities maybe? @function rgba-css-var($identifier, $target) { @return rgba( var( --#{$variable-prefix}#{$identifier}-#{$target}-rgb, var(--#{$variable-prefix}#{$identifier}-rgb) ), - var(--#{$variable-prefix}#{$target}-opacity) + var(--#{$variable-prefix}#{$target}-opacity, 1) ); } $utilities-bg-colors: map-loop($theme-colors, rgba-css-var, "$key", "bg"); +// nuke text-emphasis-variant because it resets the text colors in +// bootstrap_review_frontend (though might not matter much...) +@mixin text-emphasis-variant($parent, $color) { + #{$parent} { + --ignore: 1; + } +}