Skip to content

Commit

Permalink
Merge branch 'master' into multiselect-a11y
Browse files Browse the repository at this point in the history
  • Loading branch information
tw15egan authored Jan 17, 2020
2 parents 9c859a8 + 65cce52 commit d0cb73d
Show file tree
Hide file tree
Showing 63 changed files with 8,730 additions and 7,858 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,8 @@ const columnsExpandable = [
name: 'select',
title: 'Label name',
checkbox: true,
checkboxId: `${prefix}--checkbox-20`,
checkboxName: 'checkbox-20',
checkboxId: `${prefix}--checkbox-21`,
checkboxName: 'checkbox-21',
checkboxValue: 'green',
},
{
Expand Down Expand Up @@ -209,10 +209,10 @@ const columnsSmall = columns.slice(1, -1).map(column => ({

const rows = [
{
id: 'row-id-13',
id: 'row-id-16',
select: {
id: `${prefix}--checkbox-13`,
name: 'checkbox-13',
id: `${prefix}--checkbox-16`,
name: 'checkbox-16',
value: 'green',
label: 'Label name',
},
Expand Down Expand Up @@ -338,8 +338,8 @@ const rowsExpandable = [
` <p>A variety of content types can live here. Be sure to follow Carbon design guidelines for spacing and alignment.</p>
`,
select: {
id: `${prefix}--checkbox-12`,
name: 'checkbox-12',
id: `${prefix}--checkbox-10`,
name: 'checkbox-10',
value: 'green',
label: 'Label name',
},
Expand Down
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 d0cb73d

Please sign in to comment.