Merge branch 'master' into systems-devops-pictograms

carbon-design-system · Jun 24, 2020 · e1f05bc · e1f05bc
2 parents 6213e7b + 48a8031
commit e1f05bc
Show file tree

Hide file tree

Showing 7 changed files with 57 additions and 0 deletions.
diff --git a/e2e/pictograms-react/__snapshots__/PublicAPI-test.js.snap b/e2e/pictograms-react/__snapshots__/PublicAPI-test.js.snap
@@ -54,6 +54,8 @@ Array [
   "Camera",
   "Capitol",
   "Care",
+  "CargoCrane",
+  "CargoShip",
   "Cell",
   "ChartArea",
   "ChartBar",
@@ -217,6 +219,7 @@ Array [
   "FreeTrial",
   "Fuel",
   "Gear",
+  "Gift",
   "GlobalAnalytics",
   "GlobalAssetsAndRecovery_01",
   "GlobalAssetsAndRecovery_02",

diff --git a/e2e/pictograms/__snapshots__/PublicAPI-test.js.snap b/e2e/pictograms/__snapshots__/PublicAPI-test.js.snap
@@ -54,6 +54,8 @@ Array [
   "Camera",
   "Capitol",
   "Care",
+  "CargoCrane",
+  "CargoShip",
   "Cell",
   "ChartArea",
   "ChartBar",
@@ -217,6 +219,7 @@ Array [
   "FreeTrial",
   "Fuel",
   "Gear",
+  "Gift",
   "GlobalAnalytics",
   "GlobalAssetsAndRecovery_01",
   "GlobalAssetsAndRecovery_02",

diff --git a/packages/pictograms/categories.yml b/packages/pictograms/categories.yml
@@ -340,6 +340,8 @@ categories:
     members:
       - agriculture
       - bulldozer
+      - cargo--crane
+      - cargo--ship
       - cheese
       - farm
       - farm--01
@@ -491,6 +493,7 @@ categories:
       - coat--hanger
       - credit--card
       - customer--service
+      - gift
       - price
       - receipt
       - shirt

diff --git a/packages/pictograms/pictograms.yml b/packages/pictograms/pictograms.yml
@@ -161,6 +161,14 @@
   friendly_name: Care
   aliases:
     - care
+- name: cargo--crane
+  friendly_name: Cargo crane
+  aliases:
+    - cargo crane shipment shipping
+- name: cargo--ship
+  friendly_name: Cargo ship
+  aliases:
+    - cargo ship shipment shipping
 - name: cell
   friendly_name: Cell
   aliases:
@@ -610,6 +618,10 @@
   friendly_name: Gear
   aliases:
     - gear
+- name: gift
+  friendly_name: Gift
+  aliases:
+    - gift box
 - name: global--analytics
   friendly_name: Global analytics
   aliases: []

diff --git a/packages/pictograms/src/svg/cargo--crane.svg b/packages/pictograms/src/svg/cargo--crane.svg
diff --git a/packages/pictograms/src/svg/cargo--ship.svg b/packages/pictograms/src/svg/cargo--ship.svg
diff --git a/packages/pictograms/src/svg/gift.svg b/packages/pictograms/src/svg/gift.svg