Merge pull request #11415 from kennylam/chore/merge-cwc-v2.1.2

chore(merge): merge `release-cwc/v2.1.2` into `main`
carbon-design-system · Jan 18, 2024 · dcc3e1f · dcc3e1f
2 parents 0950a2e + d7700e5
commit dcc3e1f
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 11 deletions.
diff --git a/packages/carbon-web-components/package.json b/packages/carbon-web-components/package.json
@@ -1,7 +1,6 @@
 {
   "name": "@carbon/web-components",
-  "private": true,
-  "version": "2.1.1",
+  "version": "2.1.2",
   "publishConfig": {
     "access": "public"
   },

diff --git a/packages/carbon-web-components/src/components/data-table/_table-core.scss b/packages/carbon-web-components/src/components/data-table/_table-core.scss
@@ -1,5 +1,5 @@
 //
-// 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.

diff --git a/packages/carbon-web-components/src/components/data-table/_table-selection.scss b/packages/carbon-web-components/src/components/data-table/_table-selection.scss
@@ -1,5 +1,5 @@
 //
-// 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.
@@ -73,9 +73,9 @@
 }
 
 :host(#{$prefix}-table-row[selected][slug]) {
-  .#{$prefix}--table-column-checkbox,
   ::slotted(#{$prefix}-table-cell),
-  .#{$prefix}--table-expand {
+  .#{$prefix}--table-expand,
+  .#{$prefix}--table-column-checkbox {
     background-color: transparent;
   }
 }

diff --git a/packages/carbon-web-components/src/components/date-picker/range-plugin.ts b/packages/carbon-web-components/src/components/date-picker/range-plugin.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.
@@ -11,7 +11,7 @@
 import rangePlugin, { Config } from 'flatpickr/dist/plugins/rangePlugin';
 import { Instance as FlatpickrInstance } from 'flatpickr/dist/types/instance';
 import { Plugin } from 'flatpickr/dist/types/options';
-import on from 'carbon-components/es/globals/js/misc/on';
+import on from '../../globals/mixins/on';
 import Handle from '../../globals/internal/handle';
 
 /**

diff --git a/packages/carbon-web-components/src/components/slider/slider.scss b/packages/carbon-web-components/src/components/slider/slider.scss
@@ -1,5 +1,5 @@
 //
-// 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.

diff --git a/packages/carbon-web-components/src/components/slug/slug-story.scss b/packages/carbon-web-components/src/components/slug/slug-story.scss
@@ -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.

diff --git a/packages/carbon-web-components/tests/snapshots/cds-checkbox.md b/packages/carbon-web-components/tests/snapshots/cds-checkbox.md
@@ -61,4 +61,3 @@
 </div>
 
 ```
-