fix: carbon style import updates

carbon-design-system · Jan 15, 2025 · af601fa · af601fa
1 parent d033453
commit af601fa
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 635 deletions.
diff --git a/packages/ibm-products-styles/src/__tests__/__snapshots__/styles.test.js.snap b/packages/ibm-products-styles/src/__tests__/__snapshots__/styles.test.js.snap
diff --git a/packages/ibm-products-styles/src/components/EditTearsheet/_carbon-imports.scss b/packages/ibm-products-styles/src/components/EditTearsheet/_carbon-imports.scss
@@ -0,0 +1,9 @@
+//
+// Copyright IBM Corp. 2025, 2025
+//
+// This source code is licensed under the Apache-2.0 license found in the
+// LICENSE file in the root directory of this source tree.
+//
+
+@use '@carbon/react/scss/components/toggle/toggle';
+@use '@carbon/react/scss/components/ui-shell/side-nav';
diff --git a/packages/ibm-products-styles/src/components/EditTearsheet/_edit-tearsheet.scss b/packages/ibm-products-styles/src/components/EditTearsheet/_edit-tearsheet.scss
@@ -1,5 +1,5 @@
 //
-// Copyright IBM Corp. 2022, 2022
+// Copyright IBM Corp. 2022, 2025
 //
 // This source code is licensed under the Apache-2.0 license found in the
 // LICENSE file in the root directory of this source tree.
@@ -17,10 +17,6 @@
 // Other Carbon settings.
 @use '@carbon/react/scss/grid' as *;
 
-// EditTearsheet uses the following Carbon components:
-@use '@carbon/react/scss/components/toggle/toggle';
-@use '@carbon/react/scss/components/ui-shell/side-nav';
-
 // EditTearsheet uses the following IBM Products components:
 // TearsheetShell
 @use '../Tearsheet/tearsheet';

diff --git a/packages/ibm-products-styles/src/components/EditTearsheet/_index-with-carbon.scss b/packages/ibm-products-styles/src/components/EditTearsheet/_index-with-carbon.scss
@@ -0,0 +1,9 @@
+//
+// Copyright IBM Corp. 2025, 2025
+//
+// This source code is licensed under the Apache-2.0 license found in the
+// LICENSE file in the root directory of this source tree.
+//
+
+@use './carbon-imports';
+@use './edit-tearsheet';
diff --git a/packages/ibm-products-styles/src/components/EditTearsheet/_index.scss b/packages/ibm-products-styles/src/components/EditTearsheet/_index.scss
@@ -1,5 +1,5 @@
 //
-// Copyright IBM Corp. 2022, 2022
+// Copyright IBM Corp. 2022, 2025
 //
 // 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/ibm-products-styles/src/components/UserAvatar/_user-avatar.scss b/packages/ibm-products-styles/src/components/UserAvatar/_user-avatar.scss
@@ -1,5 +1,5 @@
 //
-// Copyright IBM Corp. 2024, 2024
+// Copyright IBM Corp. 2024, 2025
 //
 // This source code is licensed under the Apache-2.0 license found in the
 // LICENSE file in the root directory of this source tree.
@@ -15,17 +15,6 @@
 @use '@carbon/styles/scss/spacing' as *;
 @use '@carbon/styles/scss/type';
 
-// Other Carbon settings if needed
-// TODO: @use '@carbon/styles/scss/grid';
-// or
-// TODO: @use '@carbon/react/scss/grid';
-
-// UserAvatar uses the following Carbon for IBM Products components:
-// TODO: @use(s) of IBM Products component styles used by UserAvatar
-@use '@carbon/react/scss/components/tooltip';
-
-// The block part of our conventional BEM class names (blockClass__E--M).
-
 $block-class: #{$pkg-prefix}--user-avatar;
 
 $sizes: (

diff --git a/packages/ibm-products-styles/src/components/_index-released-only-with-carbon.scss b/packages/ibm-products-styles/src/components/_index-released-only-with-carbon.scss
@@ -20,6 +20,7 @@
 @use './CreateTearsheet/index-with-carbon' as *;
 @use './Datagrid/index-with-carbon' as *;
 @use './EditInPlace/index-with-carbon' as *;
+@use './EditTearsheet/index-with-carbon' as *;
 @use './EmptyStates/index-with-carbon' as *;
 @use './ExportModal/index-with-carbon' as *;
 @use './ExpressiveCard/index-with-carbon' as *;

diff --git a/packages/ibm-products-styles/src/components/_index-with-carbon.scss b/packages/ibm-products-styles/src/components/_index-with-carbon.scss
@@ -44,6 +44,7 @@
 @use './EditSidePanel/index-with-carbon' as *;
 @use './OptionsTile/index-with-carbon' as *;
 @use './EditInPlace/index-with-carbon' as *;
+@use './EditTearsheet/index-with-carbon' as *;
 @use './DataSpreadsheet/index-with-carbon' as *;
 @use './Datagrid/index-with-carbon' as *;
 @use './EditUpdateCards/index-with-carbon' as *;