fix(merge): conflicts

ariellalgilmore · Jan 31, 2024 · 4293550 · 4293550
2 parents 3396959 + d20ec1f
commit 4293550
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 10 deletions.
diff --git a/...ons-npm-11.34.0-276d7fd14e-e0e8df6471.zip → ...ons-npm-11.34.1-f7381f5483-b24dc17886.zip b/...ons-npm-11.34.0-276d7fd14e-e0e8df6471.zip → ...ons-npm-11.34.1-f7381f5483-b24dc17886.zip
diff --git a/packages/carbon-web-components/package.json b/packages/carbon-web-components/package.json
@@ -89,7 +89,7 @@
     "@babel/template": "~7.12.0",
     "@babel/traverse": "~7.23.7",
     "@carbon/icon-helpers": "10.45.1",
-    "@carbon/icons": "11.34.0",
+    "@carbon/icons": "11.34.1",
     "@open-wc/semantic-dom-diff": "~0.18.0",
     "@percy-io/in-percy": "^0.1.11",
     "@percy/cli": "^1.27.4",

diff --git a/packages/carbon-web-components/src/components/data-table/table.ts b/packages/carbon-web-components/src/components/data-table/table.ts
@@ -1,7 +1,7 @@
 /**
  * @license
  *
- * Copyright IBM Corp. 2019, 2023
+ * Copyright IBM Corp. 2019, 2024
  *
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.
@@ -632,6 +632,12 @@ class CDSTable extends HostListenerMixin(LitElement) {
     }
 
     if (changedProperties.has('isSelectable')) {
+      this._tableHeaderRow.setAttribute('selection-name', 'header');
+      this._tableRows.forEach((e, index) => {
+        if (!e.hasAttribute('selection-name')) {
+          e.setAttribute('selection-name', index);
+        }
+      });
       this.headerCount++;
     }
 

diff --git a/packages/styles/scss/components/video-player/_video-player.scss b/packages/styles/scss/components/video-player/_video-player.scss
@@ -1,5 +1,5 @@
 /**
- * Copyright IBM Corp. 2016, 2023
+ * Copyright IBM Corp. 2016, 2024
  *
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.
@@ -38,6 +38,9 @@ $aspect-ratios: ((16, 9), (9, 16), (2, 1), (1, 2), (4, 3), (3, 4), (1, 1));
         }
       }
     }
+    #{$c4d-prefix}-image {
+      padding-block-start: 0;
+    }
   }
 
   :host(#{$c4d-prefix}-video-player[background-mode='true']),

diff --git a/packages/web-components/package.json b/packages/web-components/package.json
@@ -132,7 +132,7 @@
     "@babel/traverse": "~7.23.7",
     "@carbon/ibmdotcom-services-store": "1.53.0",
     "@carbon/icon-helpers": "10.45.1",
-    "@carbon/icons": "11.34.0",
+    "@carbon/icons": "11.34.1",
     "@carbon/icons-react": "^11.33.0",
     "@carbon/pictograms-react": "11.56.1",
     "@carbon/react": "1.49.0-rc.0",

diff --git a/yarn.lock b/yarn.lock
@@ -4474,7 +4474,7 @@ __metadata:
     "@carbon/ibmdotcom-styles": "npm:2.2.0"
     "@carbon/ibmdotcom-utilities": "npm:2.2.0"
     "@carbon/icon-helpers": "npm:10.45.1"
-    "@carbon/icons": "npm:11.34.0"
+    "@carbon/icons": "npm:11.34.1"
     "@carbon/icons-react": "npm:^11.33.0"
     "@carbon/layout": "npm:11.20.1"
     "@carbon/motion": "npm:11.16.1"
@@ -4668,10 +4668,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@carbon/icons@npm:11.34.0":
-  version: 11.34.0
-  resolution: "@carbon/icons@npm:11.34.0"
-  checksum: e0e8df64715501c776ce3dbf646201e31b045ab5cc23d4b10da89804574ad7aa072764a5b097b5a24ec593e605a8dc4cdda14dc4bf8cef0899cd66306e03422c
+"@carbon/icons@npm:11.34.1":
+  version: 11.34.1
+  resolution: "@carbon/icons@npm:11.34.1"
+  checksum: b24dc17886565c1a7fd98811dce79d3a7e42644ded82bdd277940f4f1111dc9d94658125b7ef386424afe0381c03b0037f1310847770d8c42d53e0b9b12743fc
   languageName: node
   linkType: hard
 
@@ -4821,7 +4821,7 @@ __metadata:
     "@babel/template": "npm:~7.12.0"
     "@babel/traverse": "npm:~7.23.7"
     "@carbon/icon-helpers": "npm:10.45.1"
-    "@carbon/icons": "npm:11.34.0"
+    "@carbon/icons": "npm:11.34.1"
     "@carbon/styles": "npm:1.49.0-rc.0"
     "@open-wc/semantic-dom-diff": "npm:~0.18.0"
     "@percy-io/in-percy": "npm:^0.1.11"