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

Commit

Permalink
fix(Layout): 'start' and 'main' areas content alignment (#752)
Browse files Browse the repository at this point in the history
* fix alignment of Layout

* fix layout algorithm of the main area

* update changelog

* fix changelog
  • Loading branch information
kuzhelov authored Jan 22, 2019
1 parent 572290e commit 712302a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
5 changes: 2 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,19 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm

## [Unreleased]

### Features
- Expose `renderItem` and `renderSelectedItem` callbacks API for `Dropdown` @layershifter ([#746](https://github.com/stardust-ui/react/pull/746))

### Fixes
- Fix focus outline visible only during keyboard navigation in `ListItem` @layershifter ([#727](https://github.com/stardust-ui/react/pull/727))
- Pass `jest --detectLeaks` tests @miroslavstastny ([#718](https://github.com/stardust-ui/react/pull/718))
- 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))
- Add and export 'missed call' icon in Teams theme @codepretty ([#748](https://github.com/stardust-ui/react/pull/748))
- Add `Indicator` component and used it in `MenuItem` and `AccordionTitle` @mnajdova ([#721](https://github.com/stardust-ui/react/pull/721))
- Expose `renderItem` and `renderSelectedItem` callbacks API for `Dropdown` @layershifter ([#746](https://github.com/stardust-ui/react/pull/746))

<!--------------------------------[ v0.17.0 ]------------------------------- -->
## [v0.17.0](https://github.com/stardust-ui/react/tree/v0.17.0) (2019-01-17)
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

0 comments on commit 712302a

Please sign in to comment.