Merge branch 'main' into renovate/yarn-monorepo

carbon-design-system · Oct 11, 2023 · 45cd33b · 45cd33b
2 parents ca484c8 + 3e5034f
commit 45cd33b
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 16 deletions.
diff --git a/.yarn/cache/postcss-npm-8.4.27-2a9f5f8f40-1cdd0c2988.zip b/.yarn/cache/postcss-npm-8.4.27-2a9f5f8f40-1cdd0c2988.zip
diff --git a/.yarn/cache/postcss-npm-8.4.31-385051a82b-1d8611341b.zip b/.yarn/cache/postcss-npm-8.4.31-385051a82b-1d8611341b.zip
diff --git a/.yarn/cache/sass-npm-1.68.0-960a5fc7e0-65ccede83c.zip b/.yarn/cache/sass-npm-1.68.0-960a5fc7e0-65ccede83c.zip
diff --git a/.yarn/cache/sass-npm-1.69.0-b7f282719b-eabea31ea3.zip b/.yarn/cache/sass-npm-1.69.0-b7f282719b-eabea31ea3.zip
diff --git a/packages/carbon-web-components/package.json b/packages/carbon-web-components/package.json
@@ -194,7 +194,7 @@
     "rollup": "^2.55.1",
     "rollup-plugin-multi-input": "^1.3.1",
     "rtlcss": "^3.0.0",
-    "sass": "~1.68.0",
+    "sass": "~1.69.0",
     "sass-loader": "^10.0.0",
     "strip-comments": "^1.0.0",
     "style-loader": "^2.0.0",

diff --git a/packages/react/src/components/Masthead/MastheadL1.js b/packages/react/src/components/Masthead/MastheadL1.js
@@ -33,12 +33,6 @@ const MastheadL1 = ({ navigationL1, ...rest }) => {
     document
       .querySelector(`.${prefix}--header__menu-bar`)
       ?.setAttribute('role', 'menu');
-    document
-      .querySelectorAll(`.${prefix}--header__menu-bar li`)
-      .forEach((e) => {
-        e.setAttribute('role', 'menuitem');
-        e.querySelector('a').removeAttribute('role');
-      });
   }, []);
 
   const mastheadL1Links = navigationL1.map((link, index) => {

diff --git a/packages/web-components/src/components/callout-quote/__stories__/callout-quote.stories.ts b/packages/web-components/src/components/callout-quote/__stories__/callout-quote.stories.ts
@@ -50,7 +50,7 @@ export default {
     (story) => html`
       <div class="bx--grid">
         <div class="bx--row">
-          <div class="bx--col-lg-11">${story()}</div>
+          <div class="bx--offset-lg-4 bx--col-lg-12">${story()}</div>
         </div>
       </div>
     `,

diff --git a/packages/web-components/src/components/callout-quote/callout-quote.scss b/packages/web-components/src/components/callout-quote/callout-quote.scss
@@ -33,3 +33,18 @@
     margin: 1rem 0.5rem;
   }
 }
+
+:host(#{$dds-prefix}-callout-quote) {
+  .#{$prefix}--quote__wrapper {
+    margin-left: -$spacing-05;
+    margin-right: -$spacing-05;
+    @include carbon--breakpoint('md') {
+      margin-left: -$spacing-05;
+      margin-right: -$spacing-05;
+    }
+    @include carbon--breakpoint('sm') {
+      margin-left: 0;
+      margin-right: 0;
+    }
+  }
+}
diff --git a/packages/web-components/tools/get-rollup-config.js b/packages/web-components/tools/get-rollup-config.js
@@ -124,6 +124,9 @@ function getRollupConfig({
       inputs[
         `lightbox-image-viewer${dirSuffixes[dir]}${modeSuffixes[mode]}`
       ] = `src/components/lightbox-media-viewer/lightbox-image-viewer.ts`;
+      inputs[
+        `lightbox-media-viewer${dirSuffixes[dir]}${modeSuffixes[mode]}`
+      ] = `src/components/lightbox-media-viewer/lightbox-media-viewer.ts`;
       inputs[
         `lightbox-video-player${dirSuffixes[dir]}${modeSuffixes[mode]}`
       ] = `src/components/lightbox-media-viewer/lightbox-video-player-container.ts`;

diff --git a/yarn.lock b/yarn.lock
@@ -3025,7 +3025,7 @@ __metadata:
     rollup: ^2.55.1
     rollup-plugin-multi-input: ^1.3.1
     rtlcss: ^3.0.0
-    sass: ~1.68.0
+    sass: ~1.69.0
     sass-loader: ^10.0.0
     strip-comments: ^1.0.0
     style-loader: ^2.0.0
@@ -27739,13 +27739,13 @@ __metadata:
   linkType: hard
 
 "postcss@npm:^8.2.10, postcss@npm:^8.2.15, postcss@npm:^8.3.11":
-  version: 8.4.27
-  resolution: "postcss@npm:8.4.27"
+  version: 8.4.31
+  resolution: "postcss@npm:8.4.31"
   dependencies:
     nanoid: ^3.3.6
     picocolors: ^1.0.0
     source-map-js: ^1.0.2
-  checksum: 1cdd0c298849df6cd65f7e646a3ba36870a37b65f55fd59d1a165539c263e9b4872a402bf4ed1ca1bc31f58b68b2835545e33ea1a23b161a1f8aa6d5ded81e78
+  checksum: 1d8611341b073143ad90486fcdfeab49edd243377b1f51834dc4f6d028e82ce5190e4f11bb2633276864503654fb7cab28e67abdc0fbf9d1f88cad4a0ff0beea
   languageName: node
   linkType: hard
 
@@ -30523,16 +30523,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sass@npm:~1.68.0":
-  version: 1.68.0
-  resolution: "sass@npm:1.68.0"
+"sass@npm:~1.69.0":
+  version: 1.69.0
+  resolution: "sass@npm:1.69.0"
   dependencies:
     chokidar: ">=3.0.0 <4.0.0"
     immutable: ^4.0.0
     source-map-js: ">=0.6.2 <2.0.0"
   bin:
     sass: sass.js
-  checksum: 65ccede83c96768beeb8dcaf67957b7c76b12ff1276bfd2849d7be151d46ba1400048a67717e6e5e4969bc75e87348e5530f5f272833f2e60a891c21a33d8ab0
+  checksum: eabea31ea3b1dd529c7eff345c8b6468afe6ab8011bd4f95caa2cffb8fb115cc055ea21de425be6197f7ed22516f5652eccb98d315d592ea152ada553f964b8a
   languageName: node
   linkType: hard