Skip to content

Commit

Permalink
Merge branch 'master' into chore/run-yarn-dedupe
Browse files Browse the repository at this point in the history
  • Loading branch information
kodiakhq[bot] authored Jan 12, 2021
2 parents 0749f6d + d1a16cb commit 7b28289
Show file tree
Hide file tree
Showing 24 changed files with 134 additions and 238 deletions.
13 changes: 13 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
version: 2
updates:
# Maintain dependencies for GitHub Actions
- package-ecosystem: 'github-actions'
directory: '/'
schedule:
interval: 'daily'

# Maintain dependencies for npm
- package-ecosystem: 'npm'
directory: '/'
schedule:
interval: 'daily'
Binary file not shown.
Binary file not shown.
Binary file removed .yarn/cache/del-npm-4.1.1-8bc04567c6-87eecb2af5.zip
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
46 changes: 0 additions & 46 deletions aat/aat.js

This file was deleted.

33 changes: 0 additions & 33 deletions config/jest-config-carbon/matchers/toHaveNoDAPViolations.js

This file was deleted.

1 change: 0 additions & 1 deletion config/jest-config-carbon/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
"@babel/preset-env": "^7.10.0",
"@babel/preset-react": "^7.10.0",
"@babel/runtime": "^7.10.0",
"@ibma/aat": "https://able.ibm.com/tools/dist/ibma-aat-2.0.6.tgz",
"accessibility-checker": "^3.1.1",
"axe-core": "^3.3.2",
"babel-jest": "^26.0.1",
Expand Down
2 changes: 0 additions & 2 deletions config/jest-config-carbon/setup/setupAfterEnv.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
const chalk = require('chalk');
const util = require('util');
const toHaveNoAxeViolations = require('../matchers/toHaveNoAxeViolations');
const toHaveNoDAPViolations = require('../matchers/toHaveNoDAPViolations');
const toHaveNoACViolations = require('../matchers/toHaveNoACViolations');

// We can extend `expect` using custom matchers as defined by:
Expand All @@ -24,7 +23,6 @@ const toHaveNoACViolations = require('../matchers/toHaveNoACViolations');
// https://jestjs.io/docs/en/configuration.html#setupfilesafterenv-array
expect.extend({
toHaveNoAxeViolations,
toHaveNoDAPViolations,
toHaveNoACViolations,
});

Expand Down
6 changes: 1 addition & 5 deletions packages/cli/src/workspace.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,7 @@ async function getPackages() {
'list',
'--json',
]);
return JSON.parse(
// Clean-up output by stripping out `yarn` information related to the
// command and how long it took to run
lernaListOutput.split('\n').slice(2, -1).join('\n')
).filter((pkg) => !pkg.private);
return JSON.parse(lernaListOutput).filter((pkg) => !pkg.private);
}

module.exports = {
Expand Down
80 changes: 52 additions & 28 deletions packages/components/docs/sass.md
Original file line number Diff line number Diff line change
Expand Up @@ -18735,12 +18735,9 @@ Data table core styles
vertical-align: middle;
}

.#{$prefix}--data-table td {
.#{$prefix}--data-table th {
padding-right: $spacing-05;
padding-left: $spacing-05;
}

.#{$prefix}--data-table th {
color: $text-01;
background-color: $ui-03;
}
Expand All @@ -18752,8 +18749,6 @@ Data table core styles
}

.#{$prefix}--data-table .#{$prefix}--table-header-label {
padding-right: $spacing-05;
padding-left: $spacing-05;
text-align: left;
}

Expand Down Expand Up @@ -18920,22 +18915,40 @@ Data table core styles
.#{$prefix}--data-table thead th.#{$prefix}--table-expand,
.#{$prefix}--data-table tbody td.#{$prefix}--table-expand {
min-width: 0;
// spacing between checkbox / chevron and next cell should be 16px / 1rem
// adjacent cell has 16px / 1rem padding-left though, hence the removal of padding-right here
padding-right: 0;
padding-left: $spacing-05;
}

.#{$prefix}--data-table thead th.#{$prefix}--table-column-checkbox,
.#{$prefix}--data-table tbody td.#{$prefix}--table-column-checkbox {
// 16px padding left + 20px checkbox width
width: rem(36px);
width: rem(16px);
// spacing between checkbox / chevron and next cell should be 16px / 1rem
// adjacent cell has 16px / 1rem padding-left though, hence the removal of padding-right here
padding-right: $spacing-05;
padding-left: $spacing-05;
}

.#{$prefix}--data-table thead th.#{$prefix}--table-expand,
.#{$prefix}--data-table tbody td.#{$prefix}--table-expand {
// 16px padding left + 16px checkbox width
width: rem(48px);
height: rem(48px);
}

.#{$prefix}--data-table--compact thead th.#{$prefix}--table-expand,
.#{$prefix}--data-table--compact tbody td.#{$prefix}--table-expand {
width: rem(24px);
height: rem(24px);
}

.#{$prefix}--data-table--short thead th.#{$prefix}--table-expand,
.#{$prefix}--data-table--short tbody td.#{$prefix}--table-expand {
width: rem(32px);
height: rem(32px);
}

.#{$prefix}--data-table--tall thead th.#{$prefix}--table-expand,
.#{$prefix}--data-table--tall tbody td.#{$prefix}--table-expand {
width: rem(64px);
height: rem(64px);
}

.#{$prefix}--data-table--tall .#{$prefix}--table-column-checkbox {
Expand Down Expand Up @@ -19546,20 +19559,26 @@ Data table expandable styles
// Expand icon column
//----------------------------------------------------------------------------
.#{$prefix}--data-table td.#{$prefix}--table-expand {
width: 2.5rem;
min-width: 2.5rem;
border-bottom: 1px solid $ui-03;
}

.#{$prefix}--data-table td.#{$prefix}--table-expand,
th.#{$prefix}--table-expand {
padding: 0 $spacing-05;
.#{$prefix}--data-table th.#{$prefix}--table-expand + th,
.#{$prefix}--data-table td.#{$prefix}--table-expand + td {
padding-left: 0;
}

.#{$prefix}--data-table--tall td.#{$prefix}--table-expand,
.#{$prefix}--data-table--tall th.#{$prefix}--table-expand {
padding-top: rem(16px);
padding-bottom: rem(16px);
.#{$prefix}--data-table
th.#{$prefix}--table-expand
+ .#{$prefix}--table-column-checkbox,
.#{$prefix}--data-table
td.#{$prefix}--table-expand
+ .#{$prefix}--table-column-checkbox {
padding-right: 0;
}

.#{$prefix}--data-table td.#{$prefix}--table-expand,
.#{$prefix}--data-table th.#{$prefix}--table-expand {
padding: 0;
}

.#{$prefix}--data-table
Expand All @@ -19576,17 +19595,21 @@ Data table expandable styles
.#{$prefix}--table-expand__button {
@include button-reset('false');

height: rem(16px);
display: inline-flex;
align-items: center;
justify-content: center;
width: 100%;
// Account for the border in `.bx--table-expand`
height: calc(100% + 1px);
vertical-align: inherit;
}

.#{$prefix}--table-expand__button:focus {
outline: none;
box-shadow: inset 0 0 0 2px $focus;
}

.#{$prefix}--table-expand__button:focus .#{$prefix}--table-expand__svg {
box-shadow: inset 0 0 0 2px $focus;

// Windows, Firefox HCM Fix
@media screen and (-ms-high-contrast: active),
screen and (prefers-contrast) {
Expand All @@ -19607,6 +19630,11 @@ Data table expandable styles
}
}

.#{$prefix}--data-table--tall .#{$prefix}--table-expand__button {
padding-top: rem(16px);
padding-bottom: rem(24px);
}

// fix expanded parent separating border length
tr.#{$prefix}--parent-row.#{$prefix}--expandable-row
td.#{$prefix}--table-expand
Expand Down Expand Up @@ -21419,10 +21447,6 @@ Link styles
.#{$prefix}--link.#{$prefix}--link--inline {
text-decoration: underline;

&:hover {
color: $hover-primary-text;
}

&:focus,
&:visited {
text-decoration: none;
Expand Down
37 changes: 25 additions & 12 deletions packages/components/src/components/data-table/_data-table-core.scss
Original file line number Diff line number Diff line change
Expand Up @@ -98,12 +98,9 @@
vertical-align: middle;
}

.#{$prefix}--data-table td {
.#{$prefix}--data-table th {
padding-right: $spacing-05;
padding-left: $spacing-05;
}

.#{$prefix}--data-table th {
color: $text-01;
background-color: $ui-03;
}
Expand All @@ -115,8 +112,6 @@
}

.#{$prefix}--data-table .#{$prefix}--table-header-label {
padding-right: $spacing-05;
padding-left: $spacing-05;
text-align: left;
}

Expand Down Expand Up @@ -283,22 +278,40 @@
.#{$prefix}--data-table thead th.#{$prefix}--table-expand,
.#{$prefix}--data-table tbody td.#{$prefix}--table-expand {
min-width: 0;
// spacing between checkbox / chevron and next cell should be 16px / 1rem
// adjacent cell has 16px / 1rem padding-left though, hence the removal of padding-right here
padding-right: 0;
padding-left: $spacing-05;
}

.#{$prefix}--data-table thead th.#{$prefix}--table-column-checkbox,
.#{$prefix}--data-table tbody td.#{$prefix}--table-column-checkbox {
// 16px padding left + 20px checkbox width
width: rem(36px);
width: rem(16px);
// spacing between checkbox / chevron and next cell should be 16px / 1rem
// adjacent cell has 16px / 1rem padding-left though, hence the removal of padding-right here
padding-right: $spacing-05;
padding-left: $spacing-05;
}

.#{$prefix}--data-table thead th.#{$prefix}--table-expand,
.#{$prefix}--data-table tbody td.#{$prefix}--table-expand {
// 16px padding left + 16px checkbox width
width: rem(48px);
height: rem(48px);
}

.#{$prefix}--data-table--compact thead th.#{$prefix}--table-expand,
.#{$prefix}--data-table--compact tbody td.#{$prefix}--table-expand {
width: rem(24px);
height: rem(24px);
}

.#{$prefix}--data-table--short thead th.#{$prefix}--table-expand,
.#{$prefix}--data-table--short tbody td.#{$prefix}--table-expand {
width: rem(32px);
height: rem(32px);
}

.#{$prefix}--data-table--tall thead th.#{$prefix}--table-expand,
.#{$prefix}--data-table--tall tbody td.#{$prefix}--table-expand {
width: rem(64px);
height: rem(64px);
}

.#{$prefix}--data-table--tall .#{$prefix}--table-column-checkbox {
Expand Down
Loading

0 comments on commit 7b28289

Please sign in to comment.