Merge branch 'main' into accordion-style-bug

carbon-design-system · Oct 5, 2022 · 0304d46 · 0304d46
2 parents b21f270 + b854ef4
commit 0304d46
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/packages/icons-vue/examples/vue-cli/yarn.lock b/packages/icons-vue/examples/vue-cli/yarn.lock
@@ -2261,9 +2261,9 @@ css-url-regex@^1.1.0:
   integrity sha1-g4NCMMyfdMRX3lnuvRVD/uuDt+w=
 
 css-what@2.1, css-what@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.2.tgz#c0876d9d0480927d7d4920dcd72af3595649554d"
-  integrity sha512-wan8dMWQ0GUeF7DGEPVjhHemVW/vy6xUYmFzRY8RYqgA0JtXC9rJmbScBjqSu6dg9q0lwPQy6ZAmJVr3PPTvqQ==
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.3.tgz#a6d7604573365fe74686c3f311c56513d88285f2"
+  integrity sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==
 
 cssesc@^0.1.0:
   version "0.1.0"

diff --git a/packages/styles/scss/components/accordion/_accordion.scss b/packages/styles/scss/components/accordion/_accordion.scss
@@ -51,6 +51,7 @@ $content-padding: 0 0 0 $spacing-05 !default;
   }
 
   .#{$prefix}--accordion__item {
+    display: list-item;
     overflow: visible;
     border-top: 1px solid $border-subtle;
     transition: all $duration-fast-02 motion(standard, productive);

diff --git a/packages/styles/scss/components/data-table/_data-table.scss b/packages/styles/scss/components/data-table/_data-table.scss
@@ -32,6 +32,7 @@
   }
 
   .#{$prefix}--data-table-content {
+    display: block;
     overflow-x: auto;
   }
 

diff --git a/packages/styles/scss/components/menu/_menu.scss b/packages/styles/scss/components/menu/_menu.scss
@@ -46,6 +46,7 @@
 
   .#{$prefix}--menu-option {
     position: relative;
+    display: list-item;
     // $size-sm
     height: 2rem;
     background-color: $layer;
@@ -123,6 +124,7 @@
   }
 
   .#{$prefix}--menu-divider {
+    display: list-item;
     width: 100%;
     height: 1px;
     margin: $spacing-02 0;