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

Commit

Permalink
- fixed focus styles
Browse files Browse the repository at this point in the history
- added changelog
  • Loading branch information
bmdalex committed Dec 4, 2018
1 parent 40c2b84 commit 6228771
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
- Fix incorrect and missing filled or outline versions of Teams SVG icons @codepretty ([#552](https://github.com/stardust-ui/react/pull/552))
- Fix truncate styles in Teams team for the `Button`'s `content` prop used as element @mnajdova ([#551](https://github.com/stardust-ui/react/pull/551))
- Fix HTML preview in the editor @layershifter ([#555](https://github.com/stardust-ui/react/pull/555))
- Fix icon overlapping for `iconOnly` prop in `Menu` component with @Bugaa92 ([#486](https://github.com/stardust-ui/react/pull/486))

### Features
- Add `render` callback as an option for shorthand value @kuzhelov ([#519](https://github.com/stardust-ui/react/pull/519))
Expand Down
3 changes: 2 additions & 1 deletion src/themes/teams/components/Menu/menuItemStyles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,6 @@ const menuItemStyles: ComponentSlotStylesInput<MenuItemPropsAndState, MenuVariab

...(pointing &&
vertical && {
border: '1px solid transparent',
borderTopLeftRadius: `${pxToRem(3)}`,
borderTopRightRadius: `${pxToRem(3)}`,
...(pointing === 'end'
Expand Down Expand Up @@ -207,6 +206,8 @@ const menuItemStyles: ComponentSlotStylesInput<MenuItemPropsAndState, MenuVariab
display: 'block',
cursor: 'pointer',

...(((pointing && vertical) || iconOnly) && { border: '1px solid transparent' }),

...(underlined
? { padding: `${pxToRem(4)} 0` }
: pointing && vertical
Expand Down
1 change: 1 addition & 0 deletions src/themes/teams/components/Menu/menuStyles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ export default {
const { iconOnly, fluid, pointing, pills, primary, underlined, vertical } = props
return {
display: 'flex',
...(iconOnly && { alignItems: 'center' }),
...(vertical && {
flexDirection: 'column',
...(!fluid && { width: pxToRem(200) }),
Expand Down

0 comments on commit 6228771

Please sign in to comment.