From 64d90c5d5d7ad8dfa9d86c4ee1be622e12aadbfe Mon Sep 17 00:00:00 2001 From: Timofey Date: Thu, 27 Jan 2022 21:01:39 +0800 Subject: [PATCH] Web:Components:PasswordInput: fixed text color for tooltip in dark theme --- .../asc-web-components/password-input/styled-password-input.js | 3 +++ packages/asc-web-components/themes/base.js | 2 ++ packages/asc-web-components/themes/dark.js | 2 ++ 3 files changed, 7 insertions(+) diff --git a/packages/asc-web-components/password-input/styled-password-input.js b/packages/asc-web-components/password-input/styled-password-input.js index ac0cfe73b8..6d2138f719 100644 --- a/packages/asc-web-components/password-input/styled-password-input.js +++ b/packages/asc-web-components/password-input/styled-password-input.js @@ -161,8 +161,11 @@ const TooltipStyle = styled.div` const StyledTooltipContainer = styled(Text)` //margin: 8px 16px 16px 16px; + color: ${(props) => props.theme.passwordInput.tooltipTextColor} !important; `; +StyledTooltipContainer.defaultProps = { theme: Base }; + const StyledTooltipItem = styled(Text)` margin-left: 8px; height: 24px; diff --git a/packages/asc-web-components/themes/base.js b/packages/asc-web-components/themes/base.js index bece5c6b6e..ecc83a48e0 100644 --- a/packages/asc-web-components/themes/base.js +++ b/packages/asc-web-components/themes/base.js @@ -696,6 +696,8 @@ const Base = { lineHeight: "32px", + tooltipTextColor: black, + text: { lineHeight: "14px", marginTop: "-2px", diff --git a/packages/asc-web-components/themes/dark.js b/packages/asc-web-components/themes/dark.js index 92c082c44a..f300dc6d6a 100644 --- a/packages/asc-web-components/themes/dark.js +++ b/packages/asc-web-components/themes/dark.js @@ -686,6 +686,8 @@ const Dark = { color: "#858585", disableColor: "#858585", + tooltipTextColor: black, + iconColor: "#646464", hoverIconColor: "#858585",