Skip to content
This repository has been archived by the owner on Mar 4, 2020. It is now read-only.

fix(Layout): 'start' and 'main' areas content alignment #752

Merged
merged 7 commits into from
Jan 22, 2019
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
- Fix Avatar's size example @mnajdova ([#745](https://github.com/stardust-ui/react/pull/745))
- Fix teams theme `Status` and `Chat.Message` styles ([#747](https://github.com/stardust-ui/react/pull/747))
- Fix `Popup` - do not stop event propagation when pressing Esc on trigger element @sophieH29 ([#750](https://github.com/stardust-ui/react/pull/750))
- Fix alignment of `Layout`'s `main` area @kuzhelov ([#752](https://github.com/stardust-ui/react/pull/752))

### Features
- Rename `Slot` component to `Box` and export it @Bugaa92 ([#713](https://github.com/stardust-ui/react/pull/713))
Expand Down
6 changes: 4 additions & 2 deletions src/themes/teams/components/Layout/layoutStyles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,23 +53,25 @@ const layoutStyles: ComponentSlotStylesInput = {

start: ({ props }): ICSSInJSStyle => ({
...(props.debug && debugArea()),
...(props.truncateStart && truncateStyle),
display: 'inline-flex',
alignItems: 'center',
...(props.truncateStart && truncateStyle),
...props.startCSS,
}),

main: ({ props }): ICSSInJSStyle => ({
...(props.debug && debugArea()),
display: 'grid',
alignItems: 'center',
...(props.truncateMain && truncateStyle),
...props.mainCSS,
}),

end: ({ props }): ICSSInJSStyle => ({
...(props.debug && debugArea()),
...(props.truncateEnd && truncateStyle),
display: 'inline-flex',
alignItems: 'center',
...(props.truncateEnd && truncateStyle),
...props.endCSS,
}),
}
Expand Down