Skip to content

Commit

Permalink
Merge branch 'master' into 6814-resize-loading-component
Browse files Browse the repository at this point in the history
  • Loading branch information
kodiakhq[bot] authored Dec 14, 2020
2 parents 6b14f27 + b0ecf07 commit e5ed66e
Show file tree
Hide file tree
Showing 8 changed files with 107 additions and 1 deletion.
4 changes: 4 additions & 0 deletions e2e/pictograms-react/__snapshots__/PublicAPI-test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ Array [
"CommercialFinancing_02",
"ConceptExpansion",
"ConceptInsights",
"ConditionBuilder",
"Connect",
"ConnectedEcosystem",
"ConnectedNodesToTheCloud",
Expand Down Expand Up @@ -228,6 +229,7 @@ Array [
"Feedback_02",
"FileBackup",
"FileTransfer",
"FilterVariable",
"FinanceStrategy",
"FinancialConsultant",
"FinancialGain",
Expand Down Expand Up @@ -460,6 +462,7 @@ Array [
"Rainy",
"RainyHeavy",
"RaleighNc",
"RandomSamples",
"Rank",
"Receipt",
"Recycle",
Expand Down Expand Up @@ -499,6 +502,7 @@ Array [
"SecurityHygiene",
"SecurityIntelligence",
"SecurityShield",
"SelectRange",
"ServerRack",
"Servers",
"Shirt",
Expand Down
4 changes: 4 additions & 0 deletions e2e/pictograms/__snapshots__/PublicAPI-test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ Array [
"CommercialFinancing_02",
"ConceptExpansion",
"ConceptInsights",
"ConditionBuilder",
"Connect",
"ConnectedEcosystem",
"ConnectedNodesToTheCloud",
Expand Down Expand Up @@ -228,6 +229,7 @@ Array [
"Feedback_02",
"FileBackup",
"FileTransfer",
"FilterVariable",
"FinanceStrategy",
"FinancialConsultant",
"FinancialGain",
Expand Down Expand Up @@ -459,6 +461,7 @@ Array [
"Rainy",
"RainyHeavy",
"RaleighNc",
"RandomSamples",
"Rank",
"Receipt",
"Recycle",
Expand Down Expand Up @@ -498,6 +501,7 @@ Array [
"SecurityHygiene",
"SecurityIntelligence",
"SecurityShield",
"SelectRange",
"ServerRack",
"Servers",
"Shirt",
Expand Down
4 changes: 4 additions & 0 deletions packages/pictograms/categories.yml
Original file line number Diff line number Diff line change
Expand Up @@ -137,13 +137,15 @@ categories:
- cloud--strategy
- cloud--tutorials
- cloud--vmware
- condition--builder
- cognos--analytics
- construct
- devops
- digital
- docker
- expand--horz
- expand--vert
- filter--variable
- free--trial
- global--business--services
- global--technology--services
Expand All @@ -158,7 +160,9 @@ categories:
- mas
- mqa
- planning--analytics
- random--samples
- saas--enablement
- select--range
- single--sign-on
- softlayer--enablement
- name: Controls
Expand Down
31 changes: 30 additions & 1 deletion packages/pictograms/pictograms.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1055,6 +1055,13 @@
- concept
- insights
- watson
- name: condition--builder
friendly_name: Condition builder
aliases:
- condition builder
- if
- condition
- code
- name: connect
friendly_name: Connect
aliases:
Expand Down Expand Up @@ -1638,6 +1645,12 @@
- file
- transfer
- move
- name: filter--variable
friendly_name: Filter variable
aliases:
- filter variable
- variable
- define variable
- name: finance--strategy
friendly_name: Finance strategy
aliases:
Expand Down Expand Up @@ -3226,6 +3239,12 @@
- Raleigh
- city
- cities
- name: random--samples
friendly_name: Random samples
aliases:
- random samples
- random
- dice
- name: rank
friendly_name: Rank
aliases:
Expand Down Expand Up @@ -3431,6 +3450,7 @@
- matrix
- chart
- data analytics
- data visualization
- data
- analytics
- name: seattle
Expand All @@ -3447,6 +3467,7 @@
- data
- data analytics
- analytics
- security
- name: secure--hybrid--cloud
friendly_name: Secure Hybrid Cloud
aliases:
Expand Down Expand Up @@ -3485,10 +3506,18 @@
- security
- intelligence
- name: security--shield
friendly_name: Security shield
friendly_name: IBM Security™
aliases:
- IBM
- security
- shield
- name: select--range
friendly_name: Select range
aliases:
- select range
- select
- range
- multiline select
- name: server--rack
friendly_name: Server rack
aliases:
Expand Down
13 changes: 13 additions & 0 deletions packages/pictograms/src/svg/condition--builder.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
28 changes: 28 additions & 0 deletions packages/pictograms/src/svg/filter--variable.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 15 additions & 0 deletions packages/pictograms/src/svg/random--samples.svg
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/select--range.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit e5ed66e

Please sign in to comment.