Merge branch 'main' into 7732-remove-deprecated-icons-from-sketch-plugin

carbon-design-system · Mar 16, 2021 · 6cdb8d1 · 6cdb8d1
2 parents 0f8fa75 + c8c5865
commit 6cdb8d1
Show file tree

Hide file tree

Showing 13 changed files with 11,697 additions and 11,611 deletions.
diff --git a/e2e/icons-react/__snapshots__/PublicAPI-test.js.snap b/e2e/icons-react/__snapshots__/PublicAPI-test.js.snap
@@ -4491,6 +4491,10 @@ Array [
   "Scan20",
   "Scan24",
   "Scan32",
+  "ScanDisabled16",
+  "ScanDisabled20",
+  "ScanDisabled24",
+  "ScanDisabled32",
   "ScatterMatrix16",
   "ScatterMatrix20",
   "ScatterMatrix24",
@@ -5495,6 +5499,10 @@ Array [
   "User20",
   "User24",
   "User32",
+  "UserAccess16",
+  "UserAccess20",
+  "UserAccess24",
+  "UserAccess32",
   "UserActivity16",
   "UserActivity20",
   "UserActivity24",

diff --git a/e2e/icons-vue/__snapshots__/PublicAPI-test.js.snap b/e2e/icons-vue/__snapshots__/PublicAPI-test.js.snap
@@ -4491,6 +4491,10 @@ Array [
   "Scan20",
   "Scan24",
   "Scan32",
+  "ScanDisabled16",
+  "ScanDisabled20",
+  "ScanDisabled24",
+  "ScanDisabled32",
   "ScatterMatrix16",
   "ScatterMatrix20",
   "ScatterMatrix24",
@@ -5495,6 +5499,10 @@ Array [
   "User20",
   "User24",
   "User32",
+  "UserAccess16",
+  "UserAccess20",
+  "UserAccess24",
+  "UserAccess32",
   "UserActivity16",
   "UserActivity20",
   "UserActivity24",

diff --git a/e2e/icons/__snapshots__/PublicAPI-test.js.snap b/e2e/icons/__snapshots__/PublicAPI-test.js.snap
@@ -4491,6 +4491,10 @@ Array [
   "Scan20",
   "Scan24",
   "Scan32",
+  "ScanDisabled16",
+  "ScanDisabled20",
+  "ScanDisabled24",
+  "ScanDisabled32",
   "ScatterMatrix16",
   "ScatterMatrix20",
   "ScatterMatrix24",
@@ -5495,6 +5499,10 @@ Array [
   "User20",
   "User24",
   "User32",
+  "UserAccess16",
+  "UserAccess20",
+  "UserAccess24",
+  "UserAccess32",
   "UserActivity16",
   "UserActivity20",
   "UserActivity24",

diff --git a/packages/components/src/components/accordion/_accordion.scss b/packages/components/src/components/accordion/_accordion.scss
@@ -98,11 +98,11 @@
 
   .#{$prefix}--accordion__item--disabled,
   .#{$prefix}--accordion__item--disabled + .#{$prefix}--accordion__item {
-    border-top: 1px solid $disabled-01;
+    border-top: 1px solid $disabled-02;
   }
 
   li.#{$prefix}--accordion__item--disabled:last-of-type {
-    border-bottom: 1px solid $disabled-01;
+    border-bottom: 1px solid $disabled-02;
   }
 
   .#{$prefix}--accordion__arrow {

diff --git a/packages/components/src/components/checkbox/_checkbox.scss b/packages/components/src/components/checkbox/_checkbox.scss
@@ -99,7 +99,7 @@
   .#{$prefix}--checkbox-label::after {
     position: absolute;
     top: rem(8px);
-    left: rem(6px);
+    left: rem(7px);
     width: rem(9px);
     height: rem(5px);
     margin-top: rem(-3px) #{'/*rtl:0rem*/'};

diff --git a/packages/icons/categories.yml b/packages/icons/categories.yml
@@ -355,6 +355,7 @@ categories:
           - run
           - save--model
           - scan
+          - scan--disabled
           - search
           - send
           - send--alt
@@ -1189,6 +1190,7 @@ categories:
           - sight
           - transgender
           - user
+          - user--access
           - user--activity
           - user--admin
           - user--avatar

diff --git a/packages/icons/icons.yml b/packages/icons/icons.yml
@@ -12224,6 +12224,11 @@
     - qr
   sizes:
     - 32
+- name: scan--disabled
+  friendly_name: scan--disabled
+  aliases: []
+  sizes:
+    - 32
 - name: scatter-matrix
   friendly_name: Scatter matrix
   aliases:
@@ -14763,6 +14768,11 @@
   sizes:
     - 16
     - 32
+- name: user--access
+  friendly_name: user--access
+  aliases: []
+  sizes:
+    - 32
 - name: user--activity
   friendly_name: User activity
   sizes:

diff --git a/packages/icons/master/ui-icon-master.ai b/packages/icons/master/ui-icon-master.ai
diff --git a/packages/icons/src/svg/32/scan--disabled.svg b/packages/icons/src/svg/32/scan--disabled.svg
diff --git a/packages/icons/src/svg/32/user--access.svg b/packages/icons/src/svg/32/user--access.svg
diff --git a/packages/icons/src/svg/32/watson-health/iCA-2D.svg b/packages/icons/src/svg/32/watson-health/iCA-2D.svg
diff --git a/packages/react/.storybook/Welcome/Welcome.mdx b/packages/react/.storybook/Welcome/Welcome.mdx
@@ -0,0 +1,15 @@
+# Welcome
+
+- [Carbon Website](https://www.carbondesignsystem.com/)
+- [IBM Design Language](https://www.ibm.com/design/language/)
+
+## Other Frameworks
+
+- [Carbon Angular](https://angular.carbondesignsystem.com)
+- [Carbon Vue](http://vue.carbondesignsystem.com)
+
+## Feedback
+
+Help us improve the documentation by providing feedback, asking questions on
+Slack, or updating the mdx files file on
+[GitHub](https://github.com/carbon-design-system/carbon/tree/main/packages/react/src/components).
diff --git a/packages/react/.storybook/Welcome/Welcome.stories.js b/packages/react/.storybook/Welcome/Welcome.stories.js
@@ -9,10 +9,16 @@
 
 import React from 'react';
 import { Welcome as Intro } from './Welcome';
+import mdx from './Welcome.mdx';
 
 export default {
   title: ' Getting Started/ Welcome',
   component: Intro,
+  parameters: {
+    docs: {
+      page: mdx,
+    },
+  },
 };
 
 export const Welcome = () => <Intro />;