Skip to content

Commit

Permalink
Merge branch 'master' into table-toolbar-search-disabled
Browse files Browse the repository at this point in the history
  • Loading branch information
tw15egan authored Jan 28, 2021
2 parents f6fc9f0 + 0bc8335 commit 6d3d26a
Show file tree
Hide file tree
Showing 170 changed files with 6,090 additions and 8,325 deletions.
109 changes: 109 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -646,6 +646,115 @@
"contributions": [
"code"
]
},
{
"login": "molyholy",
"name": "molyholy",
"avatar_url": "https://avatars2.githubusercontent.com/u/77503726?v=4",
"profile": "https://github.com/molyholy",
"contributions": [
"code"
]
},
{
"login": "scottdickerson",
"name": "Scott Dickerson",
"avatar_url": "https://avatars.githubusercontent.com/u/6663002?v=4",
"profile": "https://github.com/scottdickerson",
"contributions": [
"code"
]
},
{
"login": "epodgaetskiy",
"name": "Evgeniy Podgaetskiy",
"avatar_url": "https://avatars.githubusercontent.com/u/15031623?v=4",
"profile": "https://start.reactwarriors.com/join",
"contributions": [
"code"
]
},
{
"login": "CassidyJensen",
"name": "CassidyJensen",
"avatar_url": "https://avatars.githubusercontent.com/u/45407808?v=4",
"profile": "https://github.com/CassidyJensen",
"contributions": [
"code",
"a11y"
]
},
{
"login": "lattmann",
"name": "Zsolt Lattmann",
"avatar_url": "https://avatars.githubusercontent.com/u/1108945?v=4",
"profile": "https://github.com/lattmann",
"contributions": [
"code"
]
},
{
"login": "ConradSchmidt",
"name": "Conrad Schmidt",
"avatar_url": "https://avatars.githubusercontent.com/u/3808948?v=4",
"profile": "https://conrad.codes/",
"contributions": [
"code"
]
},
{
"login": "IgnacioBecerra",
"name": "Ignacio Becerra",
"avatar_url": "https://avatars.githubusercontent.com/u/24970122?v=4",
"profile": "https://github.com/IgnacioBecerra",
"contributions": [
"code"
]
},
{
"login": "swapnilpatil21",
"name": "Swapnil Patil",
"avatar_url": "https://avatars.githubusercontent.com/u/46713873?v=4",
"profile": "https://github.com/swapnilpatil21",
"contributions": [
"doc"
]
},
{
"login": "sophiiae",
"name": "Fei Z",
"avatar_url": "https://avatars.githubusercontent.com/u/18622886?v=4",
"profile": "https://github.com/sophiiae",
"contributions": [
"code"
]
},
{
"login": "IgnasA",
"name": "Ignas Ausiejus",
"avatar_url": "https://avatars.githubusercontent.com/u/7099068?v=4",
"profile": "https://github.com/IgnasA",
"contributions": [
"doc"
]
},
{
"login": "ryanomackey",
"name": "Ryan O. Mackey",
"avatar_url": "https://avatars.githubusercontent.com/u/17710824?v=4",
"profile": "https://ryanomackey.com/",
"contributions": [
"code"
]
},
{
"login": "skateman",
"name": "Dávid Halász",
"avatar_url": "https://avatars.githubusercontent.com/u/649130?v=4",
"profile": "http://www.skateman.eu/",
"contributions": [
"code"
]
}
],
"commitConvention": "none"
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed .yarn/cache/vlq-npm-0.2.3-292fe9aaa1-48055a9675.zip
Binary file not shown.
14 changes: 14 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,20 @@ check out our [Contributing Guide](/.github/CONTRIBUTING.md) and our
</tr>
<tr>
<td align="center"><a href="https://github.com/DavidSCChen"><img src="https://avatars1.githubusercontent.com/u/54974983?v=4?s=100" width="100px;" alt=""/><br /><sub><b>DavidSCChen</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=DavidSCChen" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/molyholy"><img src="https://avatars2.githubusercontent.com/u/77503726?v=4?s=100" width="100px;" alt=""/><br /><sub><b>molyholy</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=molyholy" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/scottdickerson"><img src="https://avatars.githubusercontent.com/u/6663002?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Scott Dickerson</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=scottdickerson" title="Code">💻</a></td>
<td align="center"><a href="https://start.reactwarriors.com/join"><img src="https://avatars.githubusercontent.com/u/15031623?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Evgeniy Podgaetskiy</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=epodgaetskiy" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/CassidyJensen"><img src="https://avatars.githubusercontent.com/u/45407808?v=4?s=100" width="100px;" alt=""/><br /><sub><b>CassidyJensen</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=CassidyJensen" title="Code">💻</a> <a href="#a11y-CassidyJensen" title="Accessibility">️️️️♿️</a></td>
<td align="center"><a href="https://github.com/lattmann"><img src="https://avatars.githubusercontent.com/u/1108945?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Zsolt Lattmann</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=lattmann" title="Code">💻</a></td>
<td align="center"><a href="https://conrad.codes/"><img src="https://avatars.githubusercontent.com/u/3808948?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Conrad Schmidt</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=ConradSchmidt" title="Code">💻</a></td>
</tr>
<tr>
<td align="center"><a href="https://github.com/IgnacioBecerra"><img src="https://avatars.githubusercontent.com/u/24970122?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ignacio Becerra</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=IgnacioBecerra" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/swapnilpatil21"><img src="https://avatars.githubusercontent.com/u/46713873?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Swapnil Patil</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=swapnilpatil21" title="Documentation">📖</a></td>
<td align="center"><a href="https://github.com/sophiiae"><img src="https://avatars.githubusercontent.com/u/18622886?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Fei Z</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=sophiiae" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/IgnasA"><img src="https://avatars.githubusercontent.com/u/7099068?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ignas Ausiejus</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=IgnasA" title="Documentation">📖</a></td>
<td align="center"><a href="https://ryanomackey.com/"><img src="https://avatars.githubusercontent.com/u/17710824?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ryan O. Mackey</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=ryanomackey" title="Code">💻</a></td>
<td align="center"><a href="http://www.skateman.eu/"><img src="https://avatars.githubusercontent.com/u/649130?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Halász Dávid</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=skateman" title="Code">💻</a></td>
</tr>
</table>

Expand Down
2 changes: 1 addition & 1 deletion config/jest-config-carbon/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "jest-config-carbon",
"private": true,
"description": "Jest configuration and preset for Carbon",
"version": "0.1.0-rc.0",
"version": "0.1.0",
"license": "Apache-2.0",
"main": "index.js",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion config/prettier-config-carbon/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "prettier-config-carbon",
"description": "Prettier config for the Carbon Design System",
"version": "0.6.0-rc.0",
"version": "0.6.0",
"license": "Apache-2.0",
"main": "index.js",
"repository": {
Expand Down
24 changes: 24 additions & 0 deletions docs/migration/11.x-layout.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Layout

**Note: everything in this file is a work-in-progress and will be changed.**

## Changes

| v10 | v11 |
| --------------------------------- | ------------------------- |
| `$carbon--base-font-size` | `$base-font-size` |
| `carbon--rem` | `rem` |
| `carbon--em` | `em` |
| `$carbon--grid-gutter` | `$grid-gutter` |
| `$carbon--grid-gutter--condensed` | `$grid-gutter--condensed` |
| `$carbon--grid-breakpoints` | `$grid-breakpoints` |
| `carbon--breakpoint-next` | `breakpoint-next` |
| `carbon--breakpoint-prev` | `breakpoint-prev` |
| `carbon--is-smallest-breakpoint` | `is-smallest-breakpoint` |
| `carbon--largest-breakpoint-name` | `largest-breakpoint-name` |
| `carbon--breakpoint-infix` | `breakpoint-infix` |
| `carbon--breakpoint-up` | `breakpoint-up` |
| `carbon--breakpoint-down` | `breakpoint-down` |
| `carbon--breakpoint-between` | `breakpoint-between` |
| `carbon--largest-breakpoint` | `largest-breakpoint` |
| `carbon--breakpoint` | `breakpoint` |
11 changes: 11 additions & 0 deletions docs/migration/11.x-motion.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Motion

**Note: everything in this file is a work-in-progress and will be changed.**

## Changes

| v10 | v11 |
| -------------------------- | ---------- |
| `$carbon--easings` | `$easings` |
| `@function carbon--motion` | `motion` |
| `@mixin carbon--motion` | `motion` |
8 changes: 4 additions & 4 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/cli",
"description": "Task automation for working with the Carbon Design System",
"version": "10.18.0-rc.0",
"version": "10.18.0",
"license": "Apache-2.0",
"bin": {
"carbon-cli": "./bin/carbon-cli.js"
Expand Down Expand Up @@ -29,7 +29,7 @@
"@octokit/rest": "^16.28.1",
"@rollup/plugin-babel": "^5.2.2",
"@rollup/plugin-commonjs": "^17.0.0",
"@rollup/plugin-node-resolve": "^11.0.1",
"@rollup/plugin-node-resolve": "^11.1.0",
"chalk": "^2.4.2",
"change-case": "^4.1.2",
"child-process-promise": "^2.2.1",
Expand All @@ -42,11 +42,11 @@
"lodash.template": "^4.5.0",
"markdown-toc": "^1.2.0",
"prettier": "^2.2.1",
"prettier-config-carbon": "^0.6.0-rc.0",
"prettier-config-carbon": "^0.6.0",
"progress-estimator": "^0.2.2",
"remark": "^10.0.1",
"replace-in-file": "^6.1.0",
"rollup": "^2.36.1",
"rollup": "^2.38.0",
"sass": "^1.32.4",
"sassdoc": "^2.7.3",
"yargs": "^15.1.0"
Expand Down
1 change: 1 addition & 0 deletions packages/colors/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
scss
index.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`modules.scss Public API 1`] = `
exports[`@carbon/colors Public API 1`] = `
Object {
"black": "#000000",
"black-100": "#000000",
Expand Down
6 changes: 3 additions & 3 deletions packages/colors/__tests__/modules-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ const { SassRenderer } = require('@carbon/test-utils/scss');

const { render } = SassRenderer.create(__dirname);

describe('modules.scss', () => {
describe('@carbon/colors', () => {
test('Public API', async () => {
const { getValue } = await render(`
@use 'sass:meta';
@use '../scss/module';
@use '../index.scss' as colors;
$_: get-value(meta.module-variables('module'));
$_: get-value(meta.module-variables('colors'));
`);

const variables = getValue(0);
Expand Down
Loading

0 comments on commit 6d3d26a

Please sign in to comment.