Skip to content

Commit

Permalink
Merge branch 'main' into 9367-MultiSelect-active-descendant-bug
Browse files Browse the repository at this point in the history
  • Loading branch information
dakahn authored Sep 29, 2021
2 parents 2e82529 + d4b4772 commit ea568a0
Show file tree
Hide file tree
Showing 10 changed files with 68 additions and 11 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Use Node.js 14.x
uses: actions/[email protected].0
uses: actions/[email protected].1
with:
node-version: '14.x'
- name: Run yarn dedupe
Expand All @@ -23,7 +23,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Use Node.js 14.x
uses: actions/[email protected].0
uses: actions/[email protected].1
with:
node-version: '14.x'
- name: Install dependencies
Expand All @@ -36,7 +36,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Use Node.js 14.x
uses: actions/[email protected].0
uses: actions/[email protected].1
with:
node-version: '14.x'
- name: Install dependencies
Expand All @@ -51,7 +51,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Use Node.js 14.x
uses: actions/[email protected].0
uses: actions/[email protected].1
with:
node-version: '14.x'
- uses: actions/[email protected]
Expand All @@ -77,7 +77,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Use Node.js 14.x
uses: actions/[email protected].0
uses: actions/[email protected].1
with:
node-version: '14.x'
- uses: actions/[email protected]
Expand Down Expand Up @@ -113,7 +113,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Use Node.js 14.x
uses: actions/[email protected].0
uses: actions/[email protected].1
with:
node-version: '14.x'
- uses: actions/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-react-storybook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
steps:
- uses: actions/checkout@main
- name: Use Node.js 14.x
uses: actions/[email protected].0
uses: actions/[email protected].1
with:
node-version: '14.x'
- name: Install dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-vanilla-devenv.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
steps:
- uses: actions/checkout@main
- name: Use Node.js 14.x
uses: actions/[email protected].0
uses: actions/[email protected].1
with:
node-version: '14.x'
- name: Install dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
steps:
- uses: actions/checkout@main
- name: Use Node.js 14.x
uses: actions/[email protected].0
uses: actions/[email protected].1
with:
node-version: '14.x'
- name: Install dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- uses: actions/checkout@v1

- name: Use Node.js 14.x
uses: actions/[email protected].0
uses: actions/[email protected].1
with:
node-version: '14.x'
registry-url: 'https://registry.npmjs.org'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sync-generated-files.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
steps:
- uses: actions/checkout@v1
- name: Use Node.js 14.x
uses: actions/[email protected].0
uses: actions/[email protected].1
with:
node-version: '14.x'
- name: Install dependencies
Expand Down
9 changes: 9 additions & 0 deletions packages/carbon-react/scss/components/combo-box/_index.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// Code generated by @carbon/react. DO NOT EDIT.
//
// Copyright IBM Corp. 2018, 2018
//
// This source code is licensed under the Apache-2.0 license found in the
// LICENSE file in the root directory of this source tree.
//

@forward '@carbon/styles/scss/components/combo-box';
9 changes: 9 additions & 0 deletions packages/carbon-react/scss/components/dropdown/_index.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// Code generated by @carbon/react. DO NOT EDIT.
//
// Copyright IBM Corp. 2018, 2018
//
// This source code is licensed under the Apache-2.0 license found in the
// LICENSE file in the root directory of this source tree.
//

@forward '@carbon/styles/scss/components/dropdown';
9 changes: 9 additions & 0 deletions packages/carbon-react/scss/components/multiselect/_index.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// Code generated by @carbon/react. DO NOT EDIT.
//
// Copyright IBM Corp. 2018, 2018
//
// This source code is licensed under the Apache-2.0 license found in the
// LICENSE file in the root directory of this source tree.
//

@forward '@carbon/styles/scss/components/multiselect';
30 changes: 30 additions & 0 deletions packages/carbon-react/tasks/build-styles.js
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,16 @@ async function build() {
},
],
},
{
type: 'directory',
filepath: 'combo-box',
files: [
{
type: 'file',
filepath: '_index.scss',
},
],
},
{
type: 'directory',
filepath: 'content-switcher',
Expand Down Expand Up @@ -157,6 +167,16 @@ async function build() {
},
],
},
{
type: 'directory',
filepath: 'dropdown',
files: [
{
type: 'file',
filepath: '_index.scss',
},
],
},
{
type: 'directory',
filepath: 'file-uploader',
Expand Down Expand Up @@ -237,6 +257,16 @@ async function build() {
},
],
},
{
type: 'directory',
filepath: 'multiselect',
files: [
{
type: 'file',
filepath: '_index.scss',
},
],
},
{
type: 'directory',
filepath: 'notification',
Expand Down

0 comments on commit ea568a0

Please sign in to comment.