From ff25f86a99d0171cdaa94c8a5325bec6a4d63947 Mon Sep 17 00:00:00 2001 From: Michael Dudley Date: Tue, 11 Aug 2020 13:11:59 -0400 Subject: [PATCH 1/3] updated incorrect friendly names in data analytics cat --- packages/pictograms/pictograms.yml | 44 +++++++++++++++--------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/packages/pictograms/pictograms.yml b/packages/pictograms/pictograms.yml index c4e0900ae801..7f6d680f9c2c 100644 --- a/packages/pictograms/pictograms.yml +++ b/packages/pictograms/pictograms.yml @@ -451,7 +451,7 @@ - science - biology - name: chart--3D - friendly_name: chart--3D + friendly_name: Chart 3D aliases: - chart - chart @@ -460,7 +460,7 @@ - analytics - data analytics - name: chart--area - friendly_name: chart--area + friendly_name: Chart area aliases: - chart area - chart @@ -480,7 +480,7 @@ - analytics - data analytics - name: chart--bubble - friendly_name: bubble--chart + friendly_name: Chart bubble aliases: - chart bubble - chart @@ -500,7 +500,7 @@ - analytics - data analytics - name: chart--candlestick - friendly_name: candlestick--chart + friendly_name: Chart candlestick aliases: - chart - candlestick @@ -519,7 +519,7 @@ - analytics - data analytics - name: chart--error-bar - friendly_name: chart--error-bar + friendly_name: Chart error bar aliases: - chart error bar - chart error @@ -529,7 +529,7 @@ - analytics - data analytics - name: chart--evaluation - friendly_name: chart--evaluation + friendly_name: Chart evaluation aliases: - chart evaluation - chart @@ -542,7 +542,7 @@ - study - analyze - name: chart--high-low - friendly_name: chart--high-low + friendly_name: Chart high low aliases: - chart high low - chart @@ -552,7 +552,7 @@ - analytics - data analytics - name: chart--histogram - friendly_name: chart--histogram + friendly_name: Chart histogram aliases: - chart histogram - chart @@ -572,7 +572,7 @@ - analytics - data analytics - name: chart--multi-line - friendly_name: chart--multi-line + friendly_name: Chart multi line aliases: - chart multi line - chart @@ -593,7 +593,7 @@ - analytics - data analytics - name: chart--parallel - friendly_name: chart--parallel + friendly_name: Chart parallel aliases: - chart parallel - chart @@ -613,7 +613,7 @@ - analytics - data analytics - name: chart--radar - friendly_name: chart--radar + friendly_name: Chart radar aliases: - chart radar - chart @@ -623,7 +623,7 @@ - analytics - data analytics - name: chart--river - friendly_name: chart--river + friendly_name: Chart river aliases: - chart river - chart @@ -665,7 +665,7 @@ - analytics - data analytics - name: chart--t-SNE - friendly_name: chart--t-SNE + friendly_name: Chart t-SNE aliases: - chart t-SNE - chart @@ -704,7 +704,7 @@ - debit - chip - name: circle-packing - friendly_name: circle-packing + friendly_name: Circle packing aliases: - circle packing - chart @@ -1912,7 +1912,7 @@ - data analytics - analytics - name: heat-map--02 - friendly_name: heat-map--02 + friendly_name: Heat map 02 aliases: - heat map 02 - heat @@ -2833,7 +2833,7 @@ - security - people - name: population-diagram - friendly_name: population-diagram + friendly_name: Population diagram aliases: - population diagram - population @@ -2929,7 +2929,7 @@ - strategy - approach - name: q-q-plot - friendly_name: q-q-plot + friendly_name: Q-Q plot aliases: - q q plot - qq plot @@ -3013,7 +3013,7 @@ - watson - AI - name: relationship-diagram - friendly_name: relationship-diagram + friendly_name: Relationship diagram aliases: - relationship diagram - relationship @@ -3170,7 +3170,7 @@ - weight - healthcare - name: scatter-matrix - friendly_name: scatter-matrix + friendly_name: Scatter matrix aliases: - scatter matrix - scatter @@ -3813,7 +3813,7 @@ - garbage - dustbin - name: tree--diagram - friendly_name: tree--diagram + friendly_name: Tree diagram aliases: - tree diagram - tree @@ -3822,7 +3822,7 @@ - analytics - data analytics - name: tree--map - friendly_name: tree--map + friendly_name: Tree map aliases: - tree map - tree @@ -4106,7 +4106,7 @@ - wireless - home - name: word-cloud - friendly_name: word-cloud + friendly_name: Word cloud aliases: - word cloud - word From f974140190ba323f3934e549e8bcad25c931295b Mon Sep 17 00:00:00 2001 From: Michael Dudley Date: Fri, 14 Aug 2020 15:53:18 -0400 Subject: [PATCH 2/3] controls category two name/asset updates --- packages/pictograms/categories.yml | 2 ++ packages/pictograms/deprecated.yml | 8 +++++++- packages/pictograms/pictograms.yml | 12 ++++++++++++ packages/pictograms/src/svg/video--01.svg | 9 +++++++++ packages/pictograms/src/svg/video--02.svg | 9 +++++++++ 5 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 packages/pictograms/src/svg/video--01.svg create mode 100644 packages/pictograms/src/svg/video--02.svg diff --git a/packages/pictograms/categories.yml b/packages/pictograms/categories.yml index ed2a264938c7..caa6e7c07767 100644 --- a/packages/pictograms/categories.yml +++ b/packages/pictograms/categories.yml @@ -163,6 +163,8 @@ categories: - slider - toggle - video + - video--01 + - video--02 - video--alt - video--chat - video--play diff --git a/packages/pictograms/deprecated.yml b/packages/pictograms/deprecated.yml index 645e68d20ba4..7d36fbfc4425 100644 --- a/packages/pictograms/deprecated.yml +++ b/packages/pictograms/deprecated.yml @@ -21,4 +21,10 @@ deprecated: The upload pictogram has been deprecated in favor of upload--01 - name: upload--alt reason: - The upload--alt pictogram has been deprecated in favor of upload--02 \ No newline at end of file + The upload--alt pictogram has been deprecated in favor of upload--02 + - name: video + reason: + The video pictogram has been deprecated in favor of video--01 + - name: video--alt + reason: + The video--alt pictogram has been deprecated in favor of video--02 \ No newline at end of file diff --git a/packages/pictograms/pictograms.yml b/packages/pictograms/pictograms.yml index 7f6d680f9c2c..ecc515843394 100644 --- a/packages/pictograms/pictograms.yml +++ b/packages/pictograms/pictograms.yml @@ -3940,6 +3940,18 @@ - video 01 - video - controls +- name: video--01 + friendly_name: Video 01 + aliases: + - video 01 + - video + - controls +- name: video--02 + friendly_name: Video 02 + aliases: + - video 02 + - video + - controls - name: video--alt friendly_name: Video 02 aliases: diff --git a/packages/pictograms/src/svg/video--01.svg b/packages/pictograms/src/svg/video--01.svg new file mode 100644 index 000000000000..28e9a6a9bf3a --- /dev/null +++ b/packages/pictograms/src/svg/video--01.svg @@ -0,0 +1,9 @@ + + + + + + diff --git a/packages/pictograms/src/svg/video--02.svg b/packages/pictograms/src/svg/video--02.svg new file mode 100644 index 000000000000..81155a8fd004 --- /dev/null +++ b/packages/pictograms/src/svg/video--02.svg @@ -0,0 +1,9 @@ + + + + + + From d5e69be5d181343ae8a8b4e39c8058e32bb8c80e Mon Sep 17 00:00:00 2001 From: emyarod Date: Mon, 17 Aug 2020 10:01:49 -0500 Subject: [PATCH 3/3] chore: update snapshots --- e2e/pictograms-react/__snapshots__/PublicAPI-test.js.snap | 2 ++ e2e/pictograms/__snapshots__/PublicAPI-test.js.snap | 2 ++ 2 files changed, 4 insertions(+) diff --git a/e2e/pictograms-react/__snapshots__/PublicAPI-test.js.snap b/e2e/pictograms-react/__snapshots__/PublicAPI-test.js.snap index 8c355a69d403..5293b6553fd6 100644 --- a/e2e/pictograms-react/__snapshots__/PublicAPI-test.js.snap +++ b/e2e/pictograms-react/__snapshots__/PublicAPI-test.js.snap @@ -580,6 +580,8 @@ Array [ "VideoAlt", "VideoChat", "VideoPlay", + "Video_01", + "Video_02", "Virus", "Vision", "VisualInsights", diff --git a/e2e/pictograms/__snapshots__/PublicAPI-test.js.snap b/e2e/pictograms/__snapshots__/PublicAPI-test.js.snap index f00d9c239049..8d7fdfa81e23 100644 --- a/e2e/pictograms/__snapshots__/PublicAPI-test.js.snap +++ b/e2e/pictograms/__snapshots__/PublicAPI-test.js.snap @@ -579,6 +579,8 @@ Array [ "VideoAlt", "VideoChat", "VideoPlay", + "Video_01", + "Video_02", "Virus", "Vision", "VisualInsights",