diff --git a/apps/website/screens/components/heading/specs/HeadingSpecsPage.tsx b/apps/website/screens/components/heading/specs/HeadingSpecsPage.tsx index e3a0e1bcdb..2a04c46b98 100644 --- a/apps/website/screens/components/heading/specs/HeadingSpecsPage.tsx +++ b/apps/website/screens/components/heading/specs/HeadingSpecsPage.tsx @@ -54,7 +54,7 @@ const sections = [ font-size - 32px / 2.5rem + 40px / 2.5rem font-scale-07 diff --git a/apps/website/screens/components/toast/specs/images/toast_anatomy.png b/apps/website/screens/components/toast/specs/images/toast_anatomy.png index 5f6b66262d..b22b195bc6 100644 Binary files a/apps/website/screens/components/toast/specs/images/toast_anatomy.png and b/apps/website/screens/components/toast/specs/images/toast_anatomy.png differ diff --git a/apps/website/screens/components/toast/specs/images/toast_specs.png b/apps/website/screens/components/toast/specs/images/toast_specs.png index 8ac5c2a006..7666001d8d 100644 Binary files a/apps/website/screens/components/toast/specs/images/toast_specs.png and b/apps/website/screens/components/toast/specs/images/toast_specs.png differ diff --git a/apps/website/screens/components/toast/usage/images/loading_toast.png b/apps/website/screens/components/toast/usage/images/loading_toast.png index a99cdd72e6..022b16f8ac 100644 Binary files a/apps/website/screens/components/toast/usage/images/loading_toast.png and b/apps/website/screens/components/toast/usage/images/loading_toast.png differ diff --git a/apps/website/screens/components/toast/usage/images/semantic_toasts.png b/apps/website/screens/components/toast/usage/images/semantic_toasts.png index 1d6823278a..71053efd4c 100644 Binary files a/apps/website/screens/components/toast/usage/images/semantic_toasts.png and b/apps/website/screens/components/toast/usage/images/semantic_toasts.png differ diff --git a/packages/lib/src/action-icon/ActionIcon.tsx b/packages/lib/src/action-icon/ActionIcon.tsx index dcbbb7726d..f243c98acd 100644 --- a/packages/lib/src/action-icon/ActionIcon.tsx +++ b/packages/lib/src/action-icon/ActionIcon.tsx @@ -5,39 +5,16 @@ import CoreTokens from "../common/coreTokens"; import DxcIcon from "../icon/Icon"; import { Tooltip } from "../tooltip/Tooltip"; -const DxcActionIcon = forwardRef( - ({ disabled = false, title, icon, onClick, tabIndex }, ref): JSX.Element => ( - - { - event.stopPropagation(); - }} - tabIndex={tabIndex} - type="button" - ref={ref} - > - {typeof icon === "string" ? : icon} - - - ) -); - const ActionIcon = styled.button` + all: unset; display: flex; align-items: center; justify-content: center; flex-shrink: 0; - border: none; border-radius: 2px; width: 24px; height: 24px; - font-size: 16px; - padding: 0px; ${(props) => (props.disabled ? `cursor: not-allowed;` : `cursor: pointer;`)} - box-shadow: 0 0 0 2px transparent; background-color: ${(props) => props.disabled @@ -46,7 +23,7 @@ const ActionIcon = styled.button` color: ${(props) => props.disabled ? (props.theme.disabledActionIconColor ?? CoreTokens.color_grey_500) - : (props.theme.actionIconColor ?? CoreTokens.color_black)}; + : (props.theme.actionIconColor ?? CoreTokens.color_grey_900)}; ${(props) => !props.disabled && @@ -55,22 +32,41 @@ const ActionIcon = styled.button` &:focus-visible { outline: none; box-shadow: 0 0 0 2px ${props.theme.focusActionBorderColor ?? CoreTokens.color_blue_600}; - color: ${props.theme.focusActionIconColor ?? CoreTokens.color_black}; + color: ${props.theme.focusActionIconColor ?? CoreTokens.color_grey_900}; } &:hover { background-color: ${props.theme.hoverActionBackgroundColor ?? CoreTokens.color_grey_100}; - color: ${props.theme.hoverActionIconColor ?? CoreTokens.color_black}; + color: ${props.theme.hoverActionIconColor ?? CoreTokens.color_grey_900}; } &:active { background-color: ${props.theme.activeActionBackgroundColor ?? CoreTokens.color_grey_300}; - color: ${props.theme.activeActionIconColor ?? CoreTokens.color_black}; + color: ${props.theme.activeActionIconColor ?? CoreTokens.color_grey_900}; } `} - svg { + font-size: 16px; + > svg { width: 16px; height: 16px; } `; -export default DxcActionIcon; +export default forwardRef( + ({ disabled = false, title, icon, onClick, tabIndex }, ref) => ( + + { + event.stopPropagation(); + }} + tabIndex={tabIndex} + type="button" + ref={ref} + > + {typeof icon === "string" ? : icon} + + + ) +); diff --git a/packages/lib/src/toast/Toast.tsx b/packages/lib/src/toast/Toast.tsx index bd56963947..f5d4d29794 100644 --- a/packages/lib/src/toast/Toast.tsx +++ b/packages/lib/src/toast/Toast.tsx @@ -37,29 +37,6 @@ const getSemantic = (semantic: ToastPropsType["semantic"]) => { } }; -const ContentContainer = styled.div<{ loading: ToastPropsType["loading"] }>` - display: flex; - align-items: center; - gap: ${CoreTokens.spacing_8}; - overflow: hidden; - - ${({ loading }) => !loading && `font-size: ${CoreTokens.type_scale_05}`}; - > svg { - width: 24px; - height: 24px; - } -`; - -const Message = styled.span` - color: ${CoreTokens.color_black}; - font-family: ${CoreTokens.type_sans}; - font-size: ${CoreTokens.type_scale_02}; - font-weight: ${CoreTokens.type_semibold}; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; -`; - const fadeInUp = keyframes` 0% { transform: translateY(100%); @@ -95,7 +72,6 @@ const Toast = styled.output<{ semantic: ToastPropsType["semantic"]; isClosing: b gap: ${CoreTokens.spacing_24}; padding: ${CoreTokens.spacing_8} ${CoreTokens.spacing_12}; background-color: ${({ semantic }) => getSemantic(semantic).secondaryColor}; - color: ${({ semantic }) => getSemantic(semantic).primaryColor}; animation: ${({ isClosing }) => (isClosing ? fadeOutDown : fadeInUp)} 0.3s ease forwards; @media (max-width: ${responsiveSizes.medium}rem) { @@ -103,6 +79,30 @@ const Toast = styled.output<{ semantic: ToastPropsType["semantic"]; isClosing: b } `; +const ContentContainer = styled.div<{ loading: ToastPropsType["loading"]; semantic: ToastPropsType["semantic"] }>` + display: flex; + align-items: center; + gap: ${CoreTokens.spacing_8}; + overflow: hidden; + color: ${({ semantic }) => getSemantic(semantic).primaryColor}; + + ${({ loading }) => !loading && `font-size: ${CoreTokens.type_scale_05}`}; + > svg { + width: 24px; + height: 24px; + } +`; + +const Message = styled.span` + color: ${CoreTokens.color_grey_900}; + font-family: ${CoreTokens.type_sans}; + font-size: ${CoreTokens.type_scale_02}; + font-weight: ${CoreTokens.type_semibold}; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +`; + const spinnerTheme = { spinner: { accentColor: getSemantic("info").primaryColor, @@ -156,24 +156,23 @@ const DxcToast = ({ return ( - - + + {message} {action && ( )} { if (!loading) { clearClosingAnimationTimer(); @@ -184,6 +183,7 @@ const DxcToast = ({ onClear(); }, 300); }} + title={translatedLabels.toast.clearToastActionTitle} />