Merge branch 'master' into add-controlled-accordion-animations

carbon-design-system · Feb 25, 2021 · f72318c · f72318c
2 parents c020f68 + b4d91b9
commit f72318c
Show file tree

Hide file tree

Showing 112 changed files with 698 additions and 218 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,7 +9,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Use Node.js 14.x
-        uses: actions/[email protected].4
+        uses: actions/[email protected].5
         with:
           node-version: '14.x'
       - name: Run yarn dedupe
@@ -20,7 +20,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Use Node.js 14.x
-        uses: actions/[email protected].4
+        uses: actions/[email protected].5
         with:
           node-version: '14.x'
       - name: Install dependencies
@@ -33,7 +33,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Use Node.js 14.x
-        uses: actions/[email protected].4
+        uses: actions/[email protected].5
         with:
           node-version: '14.x'
       - name: Install dependencies

diff --git a/.github/workflows/deploy-react-storybook.yml b/.github/workflows/deploy-react-storybook.yml
@@ -18,7 +18,7 @@ jobs:
     steps:
       - uses: actions/checkout@master
       - name: Use Node.js 14.x
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v2.1.5
         with:
           node-version: '14.x'
       - name: Install dependencies

diff --git a/.github/workflows/deploy-vanilla-devenv.yml b/.github/workflows/deploy-vanilla-devenv.yml
@@ -17,7 +17,7 @@ jobs:
     steps:
       - uses: actions/checkout@master
       - name: Use Node.js 14.x
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v2.1.5
         with:
           node-version: '14.x'
       - name: Install dependencies

diff --git a/.github/workflows/nightly-release.yml b/.github/workflows/nightly-release.yml
@@ -11,7 +11,7 @@ jobs:
     steps:
       - uses: actions/checkout@master
       - name: Use Node.js 14.x
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v2.1.5
         with:
           node-version: '14.x'
       - name: Install dependencies

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v1
 
       - name: Use Node.js 14.x
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v2.1.5
         with:
           node-version: '14.x'
           registry-url: 'https://registry.npmjs.org'

diff --git a/.github/workflows/sync-generated-files.yml b/.github/workflows/sync-generated-files.yml
@@ -9,7 +9,7 @@ jobs:
     steps:
       - uses: actions/checkout@v1
       - name: Use Node.js 14.x
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v2.1.5
         with:
           node-version: '14.x'
       - name: Install dependencies

diff --git a/.yarn/cache/@emotion-core-npm-10.0.27-4cad5524e3-e64cde1542.zip b/.yarn/cache/@emotion-core-npm-10.0.27-4cad5524e3-e64cde1542.zip
diff --git a/.yarn/cache/@emotion-core-npm-10.1.1-f084e0eeac-78fec4a705.zip b/.yarn/cache/@emotion-core-npm-10.1.1-f084e0eeac-78fec4a705.zip
diff --git a/.yarn/cache/@emotion-is-prop-valid-npm-0.8.8-261a0f2426-4a6993c4e6.zip b/.yarn/cache/@emotion-is-prop-valid-npm-0.8.8-261a0f2426-4a6993c4e6.zip
diff --git a/.yarn/cache/@storybook-client-logger-npm-6.1.18-3244b76cb4-acf8cf6b58.zip b/.yarn/cache/@storybook-client-logger-npm-6.1.18-3244b76cb4-acf8cf6b58.zip
diff --git a/.yarn/cache/@storybook-theming-npm-6.1.18-86b59dec65-395a079c4e.zip b/.yarn/cache/@storybook-theming-npm-6.1.18-86b59dec65-395a079c4e.zip
diff --git a/.yarn/cache/flatpickr-npm-4.6.9-9928816e33-ffcbe9ab04.zip b/.yarn/cache/flatpickr-npm-4.6.9-9928816e33-ffcbe9ab04.zip
diff --git a/...ished-npm-3.4.2-ef13ba5bfe-a8c3f0961e.zip → ...ished-npm-3.7.1-41b09aa23f-2483fc6957.zip b/...ished-npm-3.4.2-ef13ba5bfe-a8c3f0961e.zip → ...ished-npm-3.7.1-41b09aa23f-2483fc6957.zip
diff --git a/.yarn/cache/ts-dedent-npm-2.0.0-c118e16591-386cff404a.zip b/.yarn/cache/ts-dedent-npm-2.0.0-c118e16591-386cff404a.zip
diff --git a/packages/components/src/components/checkbox/_checkbox.scss b/packages/components/src/components/checkbox/_checkbox.scss
@@ -85,7 +85,8 @@
     // different checkbox states.
     width: rem(16px);
     height: rem(16px);
-    margin: rem(2px);
+    // increase left margin for #6480
+    margin: rem(2px) rem(2px) rem(2px) rem(3px);
 
     // Checkboxes with a background color look visually off against a parent container.
     background-color: transparent;

diff --git a/packages/components/src/components/list-box/_list-box.scss b/packages/components/src/components/list-box/_list-box.scss
@@ -749,9 +749,10 @@ $list-box-menu-width: rem(300px);
     border-bottom-color: $selected-light-ui;
   }
 
-  .#{$prefix}--list-box__menu-item--active:hover {
-    background-color: $hover-ui;
-    border-bottom-color: $hover-ui;
+  .#{$prefix}--list-box__menu-item--active:hover,
+  .#{$prefix}--list-box__menu-item--active.#{$prefix}--list-box__menu-item--highlighted {
+    background-color: $hover-selected-ui;
+    border-bottom-color: $hover-selected-ui;
   }
 
   .#{$prefix}--list-box__menu-item--active