Skip to content

Commit

Permalink
Merge branch 'master' into duytran/fix-duplicate-id-carbon-website
Browse files Browse the repository at this point in the history
  • Loading branch information
joshblack authored Jan 17, 2020
2 parents 2fdcc4d + 66b4833 commit d6a5c44
Show file tree
Hide file tree
Showing 62 changed files with 8,723 additions and 7,851 deletions.
1 change: 1 addition & 0 deletions packages/icon-build-helpers/src/check.js
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ const baseIconSchema = Joi.object().keys({
),
aliases: aliasesSchema,
categories: categorySchema,
deprecated: Joi.boolean(),
});

const iconSchema = baseIconSchema.keys({
Expand Down
48 changes: 48 additions & 0 deletions packages/icons/categories.yml
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,7 @@ categories:
- compare
- connect
- delete
- deploy
- deploy-rules
- drag--horizontal
- drag--vertical
Expand All @@ -220,6 +221,7 @@ categories:
- flag
- fork
- insert
- jump-link
- launch
- login
- logout
Expand Down Expand Up @@ -260,6 +262,7 @@ categories:
- shuffle
- split-screen
- tag
- tag--edit
- tag--group
- translate
- undo
Expand Down Expand Up @@ -378,6 +381,7 @@ categories:
- fish
- fish--multiple
- fruit-bowl
- gift
- industry
- inventory-management
- money
Expand Down Expand Up @@ -456,6 +460,9 @@ categories:
- save--annotation
- save--image
- save--series
- scalpel--cursor
- scalpel--lasso
- scalpel--select
- spine-label
- stacked-move
- stacked-scrolling--1
Expand All @@ -465,6 +472,7 @@ categories:
- study--previous
- study--skip
- thumbnail-preview
- text-annotation-toggle
- window--auto
- window--base
- window--overlay
Expand Down Expand Up @@ -885,14 +893,54 @@ categories:
- cloud--lightning
- cloud--rain
- cloud--snow
- cloudy
- fog
- hail
- haze
- haze--night
- humidity
- hurricane
- lightning
- mixed-rain-hail
- moon
- mostly-cloudy
- mostly-cloudy--night
- not-available
- partly-cloudy
- partly-cloudy--night
- rain
- rain--drizzle
- rain--heavy
- rain--scattered
- rain--scattered--night
- rain-drop
- sleet
- smoke
- snow
- snow--blizzard
- snow--heavy
- snow--scattered
- snow--scattered--night
- snowflake
- sun
- sunny
- sunrise
- sunset
- temperature
- temperature--frigid
- temperature--hot
- thunderstorm
- thunderstorm--scattered
- thunderstorm--scattered--night
- thunderstorm--severe
- thunderstorm--strong
- tornado
- tropical-storm
- windy
- windy--dust
- windy--snow
- windy--strong
- wintry-mix
- name: Tools
subcategories:
- name: Technology
Expand Down
15,958 changes: 8,146 additions & 7,812 deletions packages/icons/master/ui-icon-master.ai

Large diffs are not rendered by default.

Loading

0 comments on commit d6a5c44

Please sign in to comment.