Merge branch 'main' into fix-datepicker-test-react-lazy

carbon-design-system · Feb 6, 2024 · 2f3a956 · 2f3a956
2 parents 7fc9156 + 966b239
commit 2f3a956
Show file tree

Hide file tree

Showing 18 changed files with 126 additions and 95 deletions.
diff --git a/.yarn/cache/@esbuild-darwin-arm64-npm-0.19.2-84404cca9c-10.zip b/.yarn/cache/@esbuild-darwin-arm64-npm-0.19.2-84404cca9c-10.zip
diff --git a/.yarn/cache/@esbuild-darwin-arm64-npm-0.20.0-7bd6004ba0-10.zip b/.yarn/cache/@esbuild-darwin-arm64-npm-0.20.0-7bd6004ba0-10.zip
diff --git a/.yarn/cache/@esbuild-darwin-x64-npm-0.19.2-a8bb9d2fa8-10.zip b/.yarn/cache/@esbuild-darwin-x64-npm-0.19.2-a8bb9d2fa8-10.zip
diff --git a/.yarn/cache/@esbuild-darwin-x64-npm-0.20.0-0f99efeaf3-10.zip b/.yarn/cache/@esbuild-darwin-x64-npm-0.20.0-0f99efeaf3-10.zip
diff --git a/.yarn/cache/@esbuild-linux-arm64-npm-0.19.2-e53da2dc3a-10.zip b/.yarn/cache/@esbuild-linux-arm64-npm-0.19.2-e53da2dc3a-10.zip
diff --git a/.yarn/cache/@esbuild-linux-arm64-npm-0.20.0-98fee98d37-10.zip b/.yarn/cache/@esbuild-linux-arm64-npm-0.20.0-98fee98d37-10.zip
diff --git a/.yarn/cache/@esbuild-linux-x64-npm-0.19.2-1d636fb5d8-10.zip b/.yarn/cache/@esbuild-linux-x64-npm-0.19.2-1d636fb5d8-10.zip
diff --git a/.yarn/cache/@esbuild-linux-x64-npm-0.20.0-fccc96c928-10.zip b/.yarn/cache/@esbuild-linux-x64-npm-0.20.0-fccc96c928-10.zip
diff --git a/.yarn/cache/@esbuild-win32-arm64-npm-0.19.2-fc3905537a-10.zip b/.yarn/cache/@esbuild-win32-arm64-npm-0.19.2-fc3905537a-10.zip
diff --git a/.yarn/cache/@esbuild-win32-arm64-npm-0.20.0-26d5c18e5a-10.zip b/.yarn/cache/@esbuild-win32-arm64-npm-0.20.0-26d5c18e5a-10.zip
diff --git a/.yarn/cache/@esbuild-win32-x64-npm-0.19.2-faf4190546-10.zip b/.yarn/cache/@esbuild-win32-x64-npm-0.19.2-faf4190546-10.zip
diff --git a/.yarn/cache/@esbuild-win32-x64-npm-0.20.0-c89e5115c8-10.zip b/.yarn/cache/@esbuild-win32-x64-npm-0.20.0-c89e5115c8-10.zip
diff --git a/.yarn/cache/esbuild-npm-0.19.2-84addf679d-04304b84cf.zip b/.yarn/cache/esbuild-npm-0.19.2-84addf679d-04304b84cf.zip
diff --git a/.yarn/cache/esbuild-npm-0.20.0-ed7bdf2043-d881b7462f.zip b/.yarn/cache/esbuild-npm-0.20.0-ed7bdf2043-d881b7462f.zip
diff --git a/packages/react/.storybook/manager-head.html b/packages/react/.storybook/manager-head.html
@@ -27,6 +27,18 @@
   content="https://media.github.ibm.com/user/1679/files/aa651000-7749-11eb-900e-eeb9312ed756" />
 <meta name="twitter:site" content="@_carbondesign" />
 
+<footer>
+  <dds-footer-container
+    key="footer"
+    disable-locale-button="true"
+    size="micro" />,
+</footer>
+
+<script
+  key="8"
+  type="module"
+  src="https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/footer.min.js" />
+
 <!-- Storybook override -->
 <script>
   setTimeout(function () {
@@ -72,6 +84,13 @@
     display: none;
   }
 
+  footer {
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+    z-index: 99999;
+  }
+
   .os-content form span {
     font-weight: 600;
   }

diff --git a/packages/styles/scss/components/data-table/expandable/_data-table-expandable.scss b/packages/styles/scss/components/data-table/expandable/_data-table-expandable.scss
@@ -101,6 +101,8 @@
     td
     .#{$prefix}--child-row-inner-container {
     max-block-size: 100%;
+    padding-block: 1rem;
+    padding-block-end: 1.5rem;
   }
 
   // bottom border overrides

diff --git a/packages/upgrade/package.json b/packages/upgrade/package.json
@@ -39,7 +39,7 @@
   "devDependencies": {
     "chalk": "^4.1.1",
     "change-case": "^4.1.2",
-    "esbuild": "^0.19.0",
+    "esbuild": "^0.20.0",
     "execa": "^5.1.1",
     "fast-glob": "^3.2.11",
     "fs-extra": "^11.0.0",