Skip to content

Commit

Permalink
Merge branch 'main' into style/change-search-color-tokens
Browse files Browse the repository at this point in the history
  • Loading branch information
motou authored Oct 29, 2021
2 parents c6fa3d0 + 6ce1b54 commit 8857b21
Show file tree
Hide file tree
Showing 33 changed files with 329 additions and 170 deletions.
9 changes: 9 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -820,6 +820,15 @@
"contributions": [
"code"
]
},
{
"login": "TannerS",
"name": "Tanner Summers",
"avatar_url": "https://avatars.githubusercontent.com/u/8866319?v=4",
"profile": "https://github.com/TannerS",
"contributions": [
"code"
]
}
],
"commitConvention": "none"
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ check out our [Contributing Guide](/.github/CONTRIBUTING.md) and our
<td align="center"><a href="https://github.com/egriff38"><img src="https://avatars.githubusercontent.com/u/6627718?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Eshin Griffith</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=egriff38" title="Code">💻</a></td>
<td align="center"><a href="https://riantavares.github.io/"><img src="https://avatars.githubusercontent.com/u/8935295?v=4?s=100" width="100px;" alt=""/><br /><sub><b>@RianTavaresOn</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=RianTavares" title="Code">💻</a> <a href="#design-RianTavares" title="Design">🎨</a></td>
<td align="center"><a href="https://github.com/ColbyJohnIBM"><img src="https://avatars.githubusercontent.com/u/19613692?v=4?s=100" width="100px;" alt=""/><br /><sub><b>ColbyJohnIBM</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=ColbyJohnIBM" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/TannerS"><img src="https://avatars.githubusercontent.com/u/8866319?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tanner Summers</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=TannerS" title="Code">💻</a></td>
</tr>
</table>

Expand Down
12 changes: 6 additions & 6 deletions packages/carbon-react/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/react",
"description": "React components for the Carbon Design System",
"version": "0.8.0-rc.0",
"version": "0.8.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -43,11 +43,11 @@
},
"dependencies": {
"@carbon/feature-flags": "^0.6.0",
"@carbon/icons-react": "^10.41.0",
"@carbon/styles": "^0.8.0-rc.0",
"@carbon/icons-react": "^10.42.0",
"@carbon/styles": "^0.8.0",
"@carbon/telemetry": "0.0.0-alpha.6",
"carbon-components": "^10.47.0-rc.0",
"carbon-components-react": "^7.47.0-rc.0",
"carbon-components": "^10.47.0",
"carbon-components-react": "^7.47.0",
"carbon-icons": "^7.0.7"
},
"devDependencies": {
Expand All @@ -58,7 +58,7 @@
"@babel/plugin-transform-react-constant-elements": "^7.14.5",
"@babel/preset-env": "^7.14.7",
"@babel/preset-react": "^7.14.5",
"@carbon/themes": "^10.46.0-rc.0",
"@carbon/themes": "^10.46.0",
"@rollup/plugin-babel": "^5.3.0",
"@rollup/plugin-commonjs": "^18.0.0",
"@rollup/plugin-node-resolve": "^11.2.1",
Expand Down
2 changes: 1 addition & 1 deletion 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.30.0",
"version": "10.31.0",
"license": "Apache-2.0",
"bin": {
"carbon-cli": "./bin/carbon-cli.js"
Expand Down
6 changes: 3 additions & 3 deletions packages/colors/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/colors",
"description": "Colors for digital and software products using the Carbon Design System",
"version": "10.33.0",
"version": "10.34.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -36,10 +36,10 @@
"clean": "rimraf css es lib umd scss index.scss"
},
"devDependencies": {
"@carbon/cli": "^10.30.0",
"@carbon/cli": "^10.31.0",
"@carbon/cli-reporter": "^10.5.0",
"@carbon/scss-generator": "^10.13.0",
"@carbon/test-utils": "^10.19.0",
"@carbon/test-utils": "^10.20.0",
"change-case": "^4.1.1",
"fs-extra": "^8.1.0",
"node-sass": "^6.0.1",
Expand Down
12 changes: 6 additions & 6 deletions packages/components/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "carbon-components",
"description": "The Carbon Design System is IBM’s open-source design system for products and experiences.",
"version": "10.47.0-rc.0",
"version": "10.47.0",
"license": "Apache-2.0",
"main": "umd/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -80,11 +80,11 @@
"@babel/preset-env": "^7.14.7",
"@babel/preset-react": "^7.14.5",
"@babel/runtime": "^7.14.6",
"@carbon/cli": "^10.30.0",
"@carbon/elements": "^10.46.0-rc.0",
"@carbon/icons-handlebars": "^10.41.0",
"@carbon/icons-react": "^10.41.0",
"@carbon/test-utils": "^10.19.0",
"@carbon/cli": "^10.31.0",
"@carbon/elements": "^10.46.0",
"@carbon/icons-handlebars": "^10.42.0",
"@carbon/icons-react": "^10.42.0",
"@carbon/test-utils": "^10.20.0",
"@frctl/fractal": "^1.1.0",
"@rollup/plugin-babel": "^5.3.0",
"@rollup/plugin-commonjs": "^18.0.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,7 @@

.#{$prefix}--data-table thead th.#{$prefix}--table-column-checkbox,
.#{$prefix}--data-table tbody td.#{$prefix}--table-column-checkbox {
width: 2.5rem;
// spacing between checkbox / chevron and next cell should be 8px / 0.5rem
padding-right: rem(4px);
padding-left: 1rem;
Expand Down
18 changes: 9 additions & 9 deletions packages/elements/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/elements",
"description": "A collection of design elements in code for the IBM Design Language",
"version": "10.46.0-rc.0",
"version": "10.46.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -35,17 +35,17 @@
"clean": "rimraf es lib umd && node tasks/clean.js"
},
"dependencies": {
"@carbon/colors": "^10.33.0",
"@carbon/grid": "^10.39.0-rc.0",
"@carbon/icons": "^10.41.0",
"@carbon/colors": "^10.34.0",
"@carbon/grid": "^10.39.0",
"@carbon/icons": "^10.42.0",
"@carbon/import-once": "^10.6.0",
"@carbon/layout": "^10.34.0-rc.0",
"@carbon/motion": "^10.25.0",
"@carbon/themes": "^10.46.0-rc.0",
"@carbon/type": "^10.38.0-rc.0"
"@carbon/layout": "^10.34.0",
"@carbon/motion": "^10.26.0",
"@carbon/themes": "^10.46.0",
"@carbon/type": "^10.38.0"
},
"devDependencies": {
"@carbon/cli": "^10.30.0",
"@carbon/cli": "^10.31.0",
"fs-extra": "^8.1.0",
"klaw-sync": "^6.0.0",
"replace-in-file": "^3.4.2",
Expand Down
6 changes: 3 additions & 3 deletions packages/grid/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/grid",
"description": "Grid for digital and software products using the Carbon Design System",
"version": "10.39.0-rc.0",
"version": "10.39.0",
"license": "Apache-2.0",
"repository": {
"type": "git",
Expand Down Expand Up @@ -33,10 +33,10 @@
},
"dependencies": {
"@carbon/import-once": "^10.6.0",
"@carbon/layout": "^10.34.0-rc.0"
"@carbon/layout": "^10.34.0"
},
"devDependencies": {
"@carbon/cli": "^10.30.0",
"@carbon/cli": "^10.31.0",
"rimraf": "^3.0.0"
},
"eyeglass": {
Expand Down
4 changes: 2 additions & 2 deletions packages/icon-build-helpers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@carbon/icon-build-helpers",
"private": true,
"description": "Build helpers for the Carbon Design System icon library",
"version": "0.29.0",
"version": "0.30.0",
"license": "Apache-2.0",
"main": "src/index.js",
"repository": {
Expand All @@ -29,7 +29,7 @@
"@babel/template": "^7.14.5",
"@babel/types": "^7.14.5",
"@carbon/cli-reporter": "^10.5.0",
"@carbon/icon-helpers": "^10.24.0",
"@carbon/icon-helpers": "^10.25.0",
"@rollup/plugin-babel": "^5.3.0",
"@rollup/plugin-replace": "^2.4.2",
"browserslist-config-carbon": "^10.6.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/icon-helpers/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/icon-helpers",
"description": "Helpers used alongside icons for digital and software products using the Carbon Design System",
"version": "10.24.0",
"version": "10.25.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -33,7 +33,7 @@
"clean": "rimraf es lib umd"
},
"devDependencies": {
"@carbon/cli": "^10.30.0",
"@carbon/cli": "^10.31.0",
"rimraf": "^3.0.0"
},
"sideEffects": false
Expand Down
6 changes: 3 additions & 3 deletions packages/icons-handlebars/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/icons-handlebars",
"description": "Handlebars helpers for IBM Design Language icons in digital and software products using the Carbon Design System",
"version": "10.41.0",
"version": "10.42.0",
"license": "Apache-2.0",
"main": "index.js",
"repository": {
Expand All @@ -26,8 +26,8 @@
"handlebars": "^4.0.12"
},
"dependencies": {
"@carbon/icon-helpers": "^10.24.0",
"@carbon/icons": "^10.41.0"
"@carbon/icon-helpers": "^10.25.0",
"@carbon/icons": "^10.42.0"
},
"devDependencies": {
"handlebars": "^4.0.12"
Expand Down
8 changes: 4 additions & 4 deletions packages/icons-react/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/icons-react",
"description": "React components for icons in digital and software products using the Carbon Design System",
"version": "10.41.0",
"version": "10.42.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -38,13 +38,13 @@
"react": ">=16"
},
"dependencies": {
"@carbon/icon-helpers": "^10.24.0",
"@carbon/icon-helpers": "^10.25.0",
"@carbon/telemetry": "0.0.0-alpha.6",
"prop-types": "^15.7.2"
},
"devDependencies": {
"@carbon/icon-build-helpers": "^0.29.0",
"@carbon/icons": "^10.41.0",
"@carbon/icon-build-helpers": "^0.30.0",
"@carbon/icons": "^10.42.0",
"rimraf": "^3.0.2"
},
"sideEffects": false
Expand Down
6 changes: 3 additions & 3 deletions packages/icons-vue/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/icons-vue",
"description": "Vue components for icons in digital and software products using the Carbon Design System",
"version": "10.41.0",
"version": "10.42.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand All @@ -28,11 +28,11 @@
"clean": "rimraf es lib"
},
"dependencies": {
"@carbon/icon-helpers": "^10.24.0"
"@carbon/icon-helpers": "^10.25.0"
},
"devDependencies": {
"@carbon/cli-reporter": "^10.5.0",
"@carbon/icons": "^10.41.0",
"@carbon/icons": "^10.42.0",
"fs-extra": "^8.1.0",
"prettier": "^2.2.1",
"rimraf": "^3.0.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/icons/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/icons",
"description": "Icons for digital and software products using the Carbon Design System",
"version": "10.41.0",
"version": "10.42.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -41,8 +41,8 @@
"svgson": "^5.2.1"
},
"devDependencies": {
"@carbon/cli": "^10.30.0",
"@carbon/icon-build-helpers": "^0.29.0",
"@carbon/cli": "^10.31.0",
"@carbon/icon-build-helpers": "^0.30.0",
"rimraf": "^3.0.2"
}
}
6 changes: 3 additions & 3 deletions packages/layout/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/layout",
"description": "Layout helpers for digital and software products using the Carbon Design System",
"version": "10.34.0-rc.0",
"version": "10.34.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -29,10 +29,10 @@
"clean": "rimraf es lib umd scss/generated scss/modules/generated"
},
"devDependencies": {
"@carbon/cli": "^10.30.0",
"@carbon/cli": "^10.31.0",
"@carbon/cli-reporter": "^10.5.0",
"@carbon/scss-generator": "^10.13.0",
"@carbon/test-utils": "^10.19.0",
"@carbon/test-utils": "^10.20.0",
"core-js": "^3.16.0",
"rimraf": "^3.0.0"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/motion/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/motion",
"description": "Motion helpers for digital and software products using the Carbon Design System",
"version": "10.25.0",
"version": "10.26.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -29,7 +29,7 @@
"clean": "rimraf es lib umd"
},
"devDependencies": {
"@carbon/cli": "^10.30.0",
"@carbon/cli": "^10.31.0",
"rimraf": "^3.0.0"
},
"eyeglass": {
Expand Down
8 changes: 4 additions & 4 deletions packages/pictograms-react/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/pictograms-react",
"description": "React components for pictograms in digital and software products using the Carbon Design System",
"version": "11.19.0",
"version": "11.20.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -37,13 +37,13 @@
"react": ">=16"
},
"dependencies": {
"@carbon/icon-helpers": "^10.24.0",
"@carbon/icon-helpers": "^10.25.0",
"@carbon/telemetry": "0.0.0-alpha.6",
"prop-types": "^15.7.2"
},
"devDependencies": {
"@carbon/icon-build-helpers": "^0.29.0",
"@carbon/pictograms": "^11.19.0"
"@carbon/icon-build-helpers": "^0.30.0",
"@carbon/pictograms": "^11.20.0"
},
"sideEffects": false
}
4 changes: 2 additions & 2 deletions packages/pictograms/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/pictograms",
"description": "Pictograms for digital and software products using the Carbon Design System",
"version": "11.19.0",
"version": "11.20.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -31,7 +31,7 @@
"prepublishOnly": "yarn build"
},
"devDependencies": {
"@carbon/icon-build-helpers": "^0.29.0",
"@carbon/icon-build-helpers": "^0.30.0",
"rimraf": "^3.0.0"
}
}
Loading

0 comments on commit 8857b21

Please sign in to comment.