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 data-table with sorting in ie11 #6550

Merged
merged 7 commits into from
Jul 27, 2020
Merged

fix(data-table): fix data-table with sorting in ie11 #6550

Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0467b1a
fix(data-table): fix data-table with sorting in ie11
tw15egan Jul 24, 2020
2108418
Merge branch 'master' into data-sort-ie11
tw15egan Jul 24, 2020
bd8ffb8
Merge branch 'master' into data-sort-ie11
tw15egan Jul 27, 2020
71ef33d
Merge branch 'master' into data-sort-ie11
tw15egan Jul 27, 2020
d17345e
Merge branch 'master' into data-sort-ie11
tw15egan Jul 27, 2020
eb4137c
Merge branch 'master' into data-sort-ie11
tw15egan Jul 27, 2020
090c8f2
Merge branch 'master' into data-sort-ie11
kodiakhq[bot] Jul 27, 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
41 changes: 33 additions & 8 deletions packages/components/src/components/data-table/_data-table-sort.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,37 @@
display: flex;
align-items: center;
height: 100%;
min-height: 3rem;
}

.#{$prefix}--data-table--sort:not(.#{$prefix}--data-table--compact):not(.#{$prefix}--data-table--short):not(.#{$prefix}--data-table--tall)
th
.#{$prefix}--table-sort__flex {
/* IE11 workaround for align-items: center and min-height
https://github.com/philipwalton/flexbugs/issues/231 */
@media screen and (-ms-high-contrast: active),
screen and (-ms-high-contrast: none) {
height: 2.99rem;
}
}

.#{$prefix}--data-table--compact.#{$prefix}--data-table--sort
th
.#{$prefix}--table-sort__flex {
min-height: 1.5rem;
}

.#{$prefix}--data-table--short.#{$prefix}--data-table--sort
th
.#{$prefix}--table-sort__flex {
min-height: 2rem;
}

.#{$prefix}--data-table--tall.#{$prefix}--data-table--sort
th
.#{$prefix}--table-sort__flex {
align-items: flex-start;
min-height: 4rem;
}

// -------------------------------------
Expand All @@ -78,7 +109,7 @@
}

.#{$prefix}--table-sort__icon-unsorted {
width: auto;
width: rem(20px);
min-width: $layout-01;
margin-right: $spacing-05;
margin-left: $spacing-03;
Expand Down Expand Up @@ -107,7 +138,7 @@
}

.#{$prefix}--table-sort__icon {
width: auto;
width: rem(20px);
min-width: $layout-01;
margin-right: $spacing-05;
margin-left: $spacing-03;
Expand Down Expand Up @@ -142,12 +173,6 @@
height: rem(64px);
}

.#{$prefix}--data-table--tall.#{$prefix}--data-table--sort
th
.#{$prefix}--table-sort__flex {
align-items: flex-start;
}

.#{$prefix}--data-table--tall .#{$prefix}--table-sort__icon-unsorted,
.#{$prefix}--data-table--tall .#{$prefix}--table-sort__icon {
margin-top: rem(13px);
Expand Down