Merge branch 'main' into carbon-for-dotcom-and-products

carbon-design-system · Feb 22, 2023 · fd2d8c0 · fd2d8c0
2 parents 5b3182b + 0500197
commit fd2d8c0
Show file tree

Hide file tree

Showing 14 changed files with 114 additions and 94 deletions.
diff --git a/e2e/pictograms-react/__snapshots__/PublicAPI-test.js.snap b/e2e/pictograms-react/__snapshots__/PublicAPI-test.js.snap
@@ -260,6 +260,7 @@ Array [
   "DeepLearning",
   "Delete",
   "DeliverInsights",
+  "Delivered",
   "DeliveryTruck",
   "DeployingContainers",
   "Deployment",
@@ -571,6 +572,7 @@ Array [
   "MovementOfGoods_02",
   "MovementOfGoods_03",
   "MovementOfItems",
+  "MovingDolly",
   "Mqa",
   "Mri",
   "MriPatient",

diff --git a/e2e/pictograms/__snapshots__/PublicAPI-test.js.snap b/e2e/pictograms/__snapshots__/PublicAPI-test.js.snap
@@ -260,6 +260,7 @@ Array [
   "DeepLearning",
   "Delete",
   "DeliverInsights",
+  "Delivered",
   "DeliveryTruck",
   "DeployingContainers",
   "Deployment",
@@ -570,6 +571,7 @@ Array [
   "MovementOfGoods_02",
   "MovementOfGoods_03",
   "MovementOfItems",
+  "MovingDolly",
   "Mqa",
   "Mri",
   "MriPatient",

diff --git a/packages/pictograms/categories.yml b/packages/pictograms/categories.yml
@@ -934,6 +934,7 @@ categories:
   - name: Supply Chain
     members:
       - connected--nodes--to--the--cloud
+      - delivered
       - managing--contractual--flow
       - managing--items
       - monitored--item--on--conveyor
@@ -942,6 +943,7 @@ categories:
       - movement--of--goods--02
       - movement--of--goods--03
       - movement--of--items
+      - moving-dolly
       - process
   - name: Systems DevOps
     members:

diff --git a/packages/pictograms/pictograms.yml b/packages/pictograms/pictograms.yml
@@ -1780,6 +1780,11 @@
     - deliver insights
     - insights
     - watson
+- name: delivered
+  friendly_name: Delivered
+  aliases:
+    - delivery
+    - delivered
 - name: delivery--truck
   friendly_name: Delivery truck
   aliases:
@@ -3858,6 +3863,12 @@
     - movement of items
     - goods
     - shipping
+- name: moving-dolly
+  friendly_name: Moving dolly
+  aliases:
+    - moving dolly
+    - delivered
+    - delivery
 - name: mqa
   friendly_name: MQA
   aliases:

diff --git a/packages/pictograms/src/svg/advanced--fraud--protection.svg b/packages/pictograms/src/svg/advanced--fraud--protection.svg
diff --git a/packages/pictograms/src/svg/application--security.svg b/packages/pictograms/src/svg/application--security.svg
diff --git a/packages/pictograms/src/svg/assets.svg b/packages/pictograms/src/svg/assets.svg
diff --git a/packages/pictograms/src/svg/bug--virus--malware.svg b/packages/pictograms/src/svg/bug--virus--malware.svg
diff --git a/packages/pictograms/src/svg/delivered.svg b/packages/pictograms/src/svg/delivered.svg
diff --git a/packages/pictograms/src/svg/master--threat--hunting.svg b/packages/pictograms/src/svg/master--threat--hunting.svg
diff --git a/packages/pictograms/src/svg/moving-dolly.svg b/packages/pictograms/src/svg/moving-dolly.svg
diff --git a/packages/pictograms/src/svg/protect--critical--assets.svg b/packages/pictograms/src/svg/protect--critical--assets.svg