Merge branch 'master' into systems-devops-pictograms

carbon-design-system · Jun 24, 2020 · 2eefc86 · 2eefc86
2 parents c75e778 + 6ec86ca
commit 2eefc86
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 0 deletions.
diff --git a/e2e/pictograms-react/__snapshots__/PublicAPI-test.js.snap b/e2e/pictograms-react/__snapshots__/PublicAPI-test.js.snap
@@ -3,6 +3,7 @@
 exports[`@carbon/pictograms-react should not update exports without a semver change 1`] = `
 Array [
   "ActiveServer",
+  "AddDevice",
   "Advocate",
   "Agriculture",
   "AirConditioner",
@@ -146,6 +147,7 @@ Array [
   "DesignAndDevelopment_02",
   "DesignThinkingTeam",
   "Desktop",
+  "DeveloperZOs",
   "Devops",
   "Dialogue",
   "Digital",
@@ -474,6 +476,16 @@ Array [
   "SupportServices",
   "SwipeLeft",
   "SwipeRight",
+  "SystemsDevopsAnalyze",
+  "SystemsDevopsBuild",
+  "SystemsDevopsCicdPipeline",
+  "SystemsDevopsCode",
+  "SystemsDevopsDeploy",
+  "SystemsDevopsMonitor",
+  "SystemsDevopsPlan",
+  "SystemsDevopsProvision",
+  "SystemsDevopsRelease",
+  "SystemsDevopsTest",
   "TShirt",
   "Tags",
   "Target",

diff --git a/e2e/pictograms/__snapshots__/PublicAPI-test.js.snap b/e2e/pictograms/__snapshots__/PublicAPI-test.js.snap
@@ -3,6 +3,7 @@
 exports[`@carbon/pictograms should not update exports without a semver change 1`] = `
 Array [
   "ActiveServer",
+  "AddDevice",
   "Advocate",
   "Agriculture",
   "AirConditioner",
@@ -146,6 +147,7 @@ Array [
   "DesignAndDevelopment_02",
   "DesignThinkingTeam",
   "Desktop",
+  "DeveloperZOs",
   "Devops",
   "Dialogue",
   "Digital",
@@ -473,6 +475,16 @@ Array [
   "SupportServices",
   "SwipeLeft",
   "SwipeRight",
+  "SystemsDevopsAnalyze",
+  "SystemsDevopsBuild",
+  "SystemsDevopsCicdPipeline",
+  "SystemsDevopsCode",
+  "SystemsDevopsDeploy",
+  "SystemsDevopsMonitor",
+  "SystemsDevopsPlan",
+  "SystemsDevopsProvision",
+  "SystemsDevopsRelease",
+  "SystemsDevopsTest",
   "TShirt",
   "Tags",
   "Target",

diff --git a/packages/pictograms/categories.yml b/packages/pictograms/categories.yml
@@ -235,6 +235,7 @@ categories:
       - windows
   - name: Device Interaction
     members:
+      - add--device
       - augmented--reality
       - mobile--add
       - mobile--chat

diff --git a/packages/pictograms/pictograms.yml b/packages/pictograms/pictograms.yml
@@ -1,5 +1,9 @@
 - name: active--server
   friendly_name: Active server
+- name: add--device
+  friendly_name: Add device
+  aliases:
+    - add device
 - name: advocate
   friendly_name: Advocate
   aliases:
@@ -419,6 +423,10 @@
   friendly_name: Devops
   aliases:
     - devops
+- name: developer-z-os
+  friendly_name: Developer z/OS
+  aliases:
+    - developer z os
 - name: dialogue
   friendly_name: Dialogue
   aliases:

diff --git a/packages/pictograms/src/svg/add--device.svg b/packages/pictograms/src/svg/add--device.svg