Merge branch 'master' into fix/card-cta-text-wrap

carbon-design-system · Nov 8, 2021 · 15d0a52 · 15d0a52
2 parents fc915d4 + cccde8f
commit 15d0a52
Show file tree

Hide file tree

Showing 15 changed files with 57 additions and 0 deletions.
diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
@@ -4,6 +4,10 @@ on:
     branches:
       - 'release/*'
 
+concurrency:
+  group: automerge-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   automerge:
     runs-on: ubuntu-20.04

diff --git a/.github/workflows/ci-check.yml b/.github/workflows/ci-check.yml
@@ -2,6 +2,10 @@ name: ci-check
 
 on: [push, pull_request]
 
+concurrency:
+  group: ci-check-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   check-packages:
     runs-on: ubuntu-20.04

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -20,6 +20,10 @@ on:
   schedule:
     - cron: '35 16 * * 1'
 
+concurrency:
+  group: codeql-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   analyze:
     name: Analyze

diff --git a/.github/workflows/dependabot-yarn-mirror.yml b/.github/workflows/dependabot-yarn-mirror.yml
@@ -2,6 +2,10 @@ name: dependabot-yarn-mirror
 
 on: [pull_request]
 
+concurrency:
+  group: dependabot-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   update-offline-mirror:
     runs-on: ubuntu-20.04

diff --git a/.github/workflows/deploy-canary.yml b/.github/workflows/deploy-canary.yml
@@ -5,6 +5,10 @@ on:
     branches:
       - master
 
+concurrency:
+  group: deploy-canary-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   react:
     runs-on: ubuntu-20.04

diff --git a/.github/workflows/deploy-staging.yml b/.github/workflows/deploy-staging.yml
@@ -5,6 +5,10 @@ on:
     branches:
       - release/*
 
+concurrency:
+  group: deploy-staging-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   react:
     runs-on: ubuntu-20.04

diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
@@ -2,6 +2,10 @@ name: e2e-tests
 
 on: [push, pull_request]
 
+concurrency:
+  group: e2e-tests-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   storybook-web-components:
     runs-on: ubuntu-20.04

diff --git a/.github/workflows/percy-update-base-wc-e2e-codesandbox.yml b/.github/workflows/percy-update-base-wc-e2e-codesandbox.yml
@@ -5,6 +5,10 @@ on:
     branches:
       - master
 
+concurrency:
+  group: ${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   web-components:
     runs-on: ubuntu-20.04

diff --git a/.github/workflows/percy-update-base.yml b/.github/workflows/percy-update-base.yml
@@ -6,6 +6,10 @@ on:
       - master
       - release/*
 
+concurrency:
+  group: percy-update-base-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   react-storybook:
     runs-on: ubuntu-20.04

diff --git a/.github/workflows/publish-canary.yml b/.github/workflows/publish-canary.yml
@@ -5,6 +5,10 @@ on:
     branches:
       - master
 
+concurrency:
+  group: publish-canary-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   publish:
     runs-on: ubuntu-20.04

diff --git a/.github/workflows/publish-nightly.yml b/.github/workflows/publish-nightly.yml
@@ -4,6 +4,10 @@ on:
   schedule:
     - cron: '0 1 * * 1-5'
 
+concurrency:
+  group: publish-nightly-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   publish:
     runs-on: ubuntu-20.04

diff --git a/.github/workflows/publish-staging.yml b/.github/workflows/publish-staging.yml
@@ -5,6 +5,10 @@ on:
     tags:
       - 'v*'
 
+concurrency:
+  group: publish-staging-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   publish:
     runs-on: ubuntu-20.04

diff --git a/.github/workflows/release-preflight.yml b/.github/workflows/release-preflight.yml
@@ -6,6 +6,10 @@ on:
       - master
       - release/*
 
+concurrency:
+  group: release-preflight-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   react:
     runs-on: ubuntu-20.04

diff --git a/.github/workflows/snapshot-update.yml b/.github/workflows/snapshot-update.yml
@@ -7,6 +7,10 @@ on:
       - release/*
       - chore/carbon-upgrade-*
 
+concurrency:
+  group: snapshot-update-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   react:
     runs-on: ubuntu-20.04

diff --git a/packages/styles/scss/components/search-with-typeahead/_search-with-typeahead.scss b/packages/styles/scss/components/search-with-typeahead/_search-with-typeahead.scss
@@ -95,6 +95,7 @@ $button-transition: background-color 110ms, border-color 110ms, color 110ms;
     position: absolute;
     top: 0;
     right: 0;
+    display: flex;
 
     .#{$prefix}--header__search--search,
     .#{$prefix}--header__search--close {