diff --git a/packages/callout/_mixins.scss b/packages/callout/_mixins.scss index 974b929..1d65ad8 100644 --- a/packages/callout/_mixins.scss +++ b/packages/callout/_mixins.scss @@ -14,10 +14,25 @@ ._leading { padding-right: adapter.get-spacing-size(s); + line-height: inherit; + } + + ._body { + display: flex; + flex-direction: column; + margin: 0; } ._title { - margin-top: 0; + margin-block: 0; + } + + ._content > *:first-child { + margin-block-start: 0; + } + + ._content > *:last-child { + margin-block-end: 0; } @include -state-style(map-get($options, color)); @@ -59,12 +74,8 @@ font-size: adapter.get-font-size($size); line-height: adapter.get-line-height($level: $size, $density: normal); - ._leading { - line-height: adapter.get-line-height($level: $size, $density: normal); - } - - ._title { - padding-bottom: adapter.get-spacing-size(map-get(variables.$title-margin-map, $size)); + ._body { + gap: adapter.get-spacing-size(map-get(variables.$title-margin-map, $size)); } } diff --git a/packages/stories-web/src/callout.stories.tsx b/packages/stories-web/src/callout.stories.tsx index ee5571a..f15ac69 100644 --- a/packages/stories-web/src/callout.stories.tsx +++ b/packages/stories-web/src/callout.stories.tsx @@ -18,12 +18,14 @@ Index.args = { export const Multiline = Template.bind({}) Multiline.args = { children: <> -
更新に失敗しました
- 以下の入力内容を確認してください。 - +

更新に失敗しました

+
+

以下の入力内容を確認してください。

+ +
, color: "negative" } diff --git a/packages/stories-web/src/components/Callout.tsx b/packages/stories-web/src/components/Callout.tsx index a7a99f2..626d8b6 100644 --- a/packages/stories-web/src/components/Callout.tsx +++ b/packages/stories-web/src/components/Callout.tsx @@ -23,8 +23,8 @@ const Callout: FC = (props: Props) => { return (
- -
+ +
{ children }