Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix EuiNavDrawer collapse/expand button height issue #2463

Merged
merged 3 commits into from
Oct 22, 2019
Merged
Show file tree
Hide file tree
Changes from all 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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
**Bug fixes**

- Reenabled `width` property for `EuiTable` cell components ([#2452](https://github.com/elastic/eui/pull/2452))
- Fixed `EuiNavDrawer` collapse/expand button height issue
([#2463](https://github.com/elastic/eui/pull/2463))

## [`14.6.0`](https://github.com/elastic/eui/tree/v14.6.0)

Expand Down
4 changes: 2 additions & 2 deletions src/components/nav_drawer/_nav_drawer.scss
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@
transition: width $euiAnimSpeedExtraFast;
z-index: $euiZHeader + 1;

.navDrawerExpandButton-isExpanded .euiListGroupItem__button {
.euiListGroupItem__button {
padding: $euiSizeM $euiSize;
}

.navDrawerExpandButton-isCollapsed .euiListGroupItem__button {
max-width: $euiSizeXL;
max-width: 100%;
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/components/nav_drawer/nav_drawer.js
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ export class EuiNavDrawer extends Component {
let footerContent;
if (showExpandButton) {
footerContent = (
<EuiListGroup className="euiNavDrawer__expandButton">
<EuiListGroup className="euiNavDrawer__expandButton" flush>
<EuiI18n
tokens={[
'euiNavDrawer.sideNavCollapse',
Expand Down Expand Up @@ -336,8 +336,8 @@ export class EuiNavDrawer extends Component {
onClick={this.handleDrawerMenuClick}>
{/* Put expand button first so it's first in tab order then on toggle starts the tabbing of the items from the top */}
{/* TODO: Add a "skip navigation" keyboard only button */}
{modifiedChildren}
{footerContent}
{modifiedChildren}
</div>
</EuiFlexItem>
{flyoutContent}
Expand Down