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.

Sign up for GitHub

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

Jump to bottom

fix(data-table): fix table with overflow menu bugs #5794

Merged
merged 5 commits into from
Apr 7, 2020
Merged

fix(data-table): fix table with overflow menu bugs #5794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5928b67
fix(data-table): fix table with overflow menu bugs
tw15egan Apr 2, 2020
e648fd3
fix(overflow-menu): update box-shadow, color tokens
tw15egan Apr 6, 2020
a89272c
Merge branch 'master' into data-table-fixes
tw15egan Apr 6, 2020
8cac328
Merge branch 'master' into data-table-fixes
tw15egan Apr 6, 2020
adefc93
Merge branch 'master' into data-table-fixes
tw15egan Apr 7, 2020
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
15 changes: 8 additions & 7 deletions packages/components/src/components/data-table/_data-table-core.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,14 +155,8 @@
padding-bottom: 0;
}

.#{$prefix}--data-table
td.#{$prefix}--table-column-menu
.#{$prefix}--overflow-menu[aria-expanded='false']:hover {
background: $ui-03;
}

// Overflow Menu Overrides
.#{$prefix}--data-table td .#{$prefix}--overflow-menu {
.#{$prefix}--data-table td button.#{$prefix}--overflow-menu {
margin: rem(-7px) 0 rem(-8px);
}

Expand Down Expand Up @@ -195,6 +189,13 @@
}
}

.#{$prefix}--data-table
td.#{$prefix}--table-column-menu
.#{$prefix}--overflow-menu.#{$prefix}--overflow-menu--open
.#{$prefix}--overflow-menu__icon {
opacity: 1;
}

.#{$prefix}--data-table.#{$prefix}--data-table--visible-overflow-menu
td.#{$prefix}--table-column-menu
.#{$prefix}--overflow-menu
Expand Down
22 changes: 15 additions & 7 deletions packages/components/src/components/overflow-menu/_overflow-menu.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@
.#{$prefix}--overflow-menu.#{$prefix}--overflow-menu--open,
.#{$prefix}--overflow-menu.#{$prefix}--overflow-menu--open
.#{$prefix}--overflow-menu__trigger {
background-color: $ui-01;
@include box-shadow;
background-color: $field-01;
transition: none;
box-shadow: 0 2px 6px 0 rgba(0, 0, 0, 0.3);
}

.#{$prefix}--overflow-menu--light.#{$prefix}--overflow-menu--open,
Expand All @@ -75,13 +75,13 @@

.#{$prefix}--overflow-menu-options {
@include reset;
box-shadow: 0 2px 6px 0 rgba(0, 0, 0, 0.3);
@include box-shadow;
display: none;
flex-direction: column;
align-items: flex-start;
position: absolute;
z-index: z('floating');
background-color: $ui-01;
background-color: $field-01;
width: rem(160px);
list-style: none;
top: 32px;
Expand All @@ -91,19 +91,27 @@
content: '';
position: absolute;
display: block;
background-color: $ui-01;
background-color: $field-01;
transition: background-color $duration--fast-02
motion(entrance, productive);
}
}

.#{$prefix}--overflow-menu.#{$prefix}--overflow-menu--open:hover {
background-color: $field-01;
}

.#{$prefix}--overflow-menu-options--light {
background-color: $ui-02;
background-color: $field-02;
&::after {
background-color: $ui-02;
background-color: $field-02;
}
}

.#{$prefix}--overflow-menu.#{$prefix}--overflow-menu--light.#{$prefix}--overflow-menu--open:hover {
background-color: $field-02;
}

.#{$prefix}--overflow-menu-options[data-floating-menu-direction='bottom']::after {
top: rem(-3px);
left: 0;
Expand Down