feat(SW-350): fix merge conflicts

2024-10-07 14:12:04 +02:00
parent f16f62e1d1 451d461c7f
commit 4a83ecae74
6 changed files with 118 additions and 112 deletions
--- a/components/TempDesignSystem/Text/Caption/caption.module.css
+++ b/components/TempDesignSystem/Text/Caption/caption.module.css
@@ -71,10 +71,6 @@ p.caption {
  color: var(--UI-Text-Medium-contrast);
 }

-.disabled {
-  color: var(--Base-Text-Disabled);
-}
-
 .uiTextHighContrast {
  color: var(--UI-Text-High-contrast);
 }