Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Controls cat name and asset update #6676

Merged
merged 4 commits into from
Aug 17, 2020
Merged

Controls cat name and asset update #6676

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ff25f86
updated incorrect friendly names in data analytics cat
dudley-ibm Aug 11, 2020
52703b4
Merge branch 'master' of https://github.com/carbon-design-system/carb…
dudley-ibm Aug 14, 2020
f974140
controls category two name/asset updates
dudley-ibm Aug 14, 2020
d5e69be
chore: update snapshots
emyarod Aug 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions e2e/pictograms-react/__snapshots__/PublicAPI-test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -580,6 +580,8 @@ Array [
"VideoAlt",
"VideoChat",
"VideoPlay",
"Video_01",
"Video_02",
"Virus",
"Vision",
"VisualInsights",
Expand Down
2 changes: 2 additions & 0 deletions e2e/pictograms/__snapshots__/PublicAPI-test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,6 +579,8 @@ Array [
"VideoAlt",
"VideoChat",
"VideoPlay",
"Video_01",
"Video_02",
"Virus",
"Vision",
"VisualInsights",
Expand Down
2 changes: 2 additions & 0 deletions packages/pictograms/categories.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,8 @@ categories:
- slider
- toggle
- video
- video--01
- video--02
- video--alt
- video--chat
- video--play
Expand Down
8 changes: 7 additions & 1 deletion packages/pictograms/deprecated.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
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
12 changes: 12 additions & 0 deletions packages/pictograms/pictograms.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
9 changes: 9 additions & 0 deletions packages/pictograms/src/svg/video--01.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions packages/pictograms/src/svg/video--02.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.