Skip to content

Commit

Permalink
Merge branch 'bug/187' into development
Browse files Browse the repository at this point in the history
  • Loading branch information
NicolasYapla committed Oct 17, 2023
2 parents 31c6e68 + 20c108b commit dfb61ee
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 4 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,14 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## Unreleased

### Fixed

- An `Alert` component without a title label will no longer add a margin pushing the description down.

=======

## 7.0.4

### Changed
Expand Down
1 change: 0 additions & 1 deletion documentation/playground/src/molecules/AlertExamples.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ export function AlertExamples() {
</div>
<div className="u-margin-top">
<Alert
title={{ label: 'Modal alert success' }}
titleId="title2"
theme="success"
confirmButton={{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,11 @@ const renderModalAlert = (className: string, props: AlertProps) => {
<Icon name={THEME_ICON_MAP[theme]} />
</span>
)}
<HeaderTag id={titleId} className="u-margin-bottom-xs">
{title?.label}
</HeaderTag>
{title?.label && (
<HeaderTag id={titleId} className="u-margin-bottom-xs">
{title.label}
</HeaderTag>
)}
<p className={textClass}>{children}</p>
<div className="m-alert__actions">
{confirmButton ? <Button {...confirmButton} /> : null}
Expand Down

0 comments on commit dfb61ee

Please sign in to comment.