Skip to content

Commit

Permalink
Merge branch 'main' into update-floating-menu-docs
Browse files Browse the repository at this point in the history
  • Loading branch information
kodiakhq[bot] authored Jul 8, 2021
2 parents e806846 + 8ab436e commit 9f9cfb0
Show file tree
Hide file tree
Showing 48 changed files with 406 additions and 159 deletions.
2 changes: 1 addition & 1 deletion config/eslint-config-carbon/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "eslint-config-carbon",
"description": "ESLint configuration for Carbon",
"version": "2.7.0-rc.0",
"version": "2.7.0",
"license": "Apache-2.0",
"main": "index.js",
"repository": {
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.6.0-rc.0",
"version": "0.6.0",
"license": "Apache-2.0",
"main": "index.js",
"repository": {
Expand Down
8 changes: 8 additions & 0 deletions e2e/icons-react/__snapshots__/PublicAPI-test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -638,6 +638,8 @@ Array [
"CategoryNewEach20",
"CategoryNewEach24",
"CategoryNewEach32",
"CautionGlyph",
"CautionInvertedGlyph",
"Cda16",
"Cda20",
"Cda24",
Expand Down Expand Up @@ -1034,6 +1036,7 @@ Array [
"CircleDash20",
"CircleDash24",
"CircleDash32",
"CircleFillGlyph",
"CircleFilled16",
"CircleFilled20",
"CircleFilled24",
Expand All @@ -1042,6 +1045,7 @@ Array [
"CirclePacking20",
"CirclePacking24",
"CirclePacking32",
"CircleStrokeGlyph",
"Classification16",
"Classification20",
"Classification24",
Expand Down Expand Up @@ -1306,6 +1310,7 @@ Array [
"Credentials20",
"Credentials24",
"Credentials32",
"CriticalGlyph",
"Crop16",
"Crop20",
"Crop24",
Expand Down Expand Up @@ -2635,6 +2640,7 @@ Array [
"IncompleteError20",
"IncompleteError24",
"IncompleteError32",
"IncompleteGlyph",
"IncompleteWarning16",
"IncompleteWarning20",
"IncompleteWarning24",
Expand Down Expand Up @@ -4919,6 +4925,7 @@ Array [
"Sql20",
"Sql24",
"Sql32",
"SquareFillGlyph",
"StackLimitation16",
"StackLimitation20",
"StackLimitation24",
Expand Down Expand Up @@ -5563,6 +5570,7 @@ Array [
"UndefinedFilled20",
"UndefinedFilled24",
"UndefinedFilled32",
"UndefinedGlyph",
"Undo16",
"Undo20",
"Undo24",
Expand Down
8 changes: 8 additions & 0 deletions e2e/icons-vue/__snapshots__/PublicAPI-test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -639,6 +639,8 @@ Array [
"CategoryNewEach20",
"CategoryNewEach24",
"CategoryNewEach32",
"CautionGlyph",
"CautionInvertedGlyph",
"Cda16",
"Cda20",
"Cda24",
Expand Down Expand Up @@ -1035,6 +1037,7 @@ Array [
"CircleDash20",
"CircleDash24",
"CircleDash32",
"CircleFillGlyph",
"CircleFilled16",
"CircleFilled20",
"CircleFilled24",
Expand All @@ -1043,6 +1046,7 @@ Array [
"CirclePacking20",
"CirclePacking24",
"CirclePacking32",
"CircleStrokeGlyph",
"Classification16",
"Classification20",
"Classification24",
Expand Down Expand Up @@ -1307,6 +1311,7 @@ Array [
"Credentials20",
"Credentials24",
"Credentials32",
"CriticalGlyph",
"Crop16",
"Crop20",
"Crop24",
Expand Down Expand Up @@ -2635,6 +2640,7 @@ Array [
"IncompleteError20",
"IncompleteError24",
"IncompleteError32",
"IncompleteGlyph",
"IncompleteWarning16",
"IncompleteWarning20",
"IncompleteWarning24",
Expand Down Expand Up @@ -4919,6 +4925,7 @@ Array [
"Sql20",
"Sql24",
"Sql32",
"SquareFillGlyph",
"StackLimitation16",
"StackLimitation20",
"StackLimitation24",
Expand Down Expand Up @@ -5563,6 +5570,7 @@ Array [
"UndefinedFilled20",
"UndefinedFilled24",
"UndefinedFilled32",
"UndefinedGlyph",
"Undo16",
"Undo20",
"Undo24",
Expand Down
8 changes: 8 additions & 0 deletions e2e/icons/__snapshots__/PublicAPI-test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -638,6 +638,8 @@ Array [
"CategoryNewEach20",
"CategoryNewEach24",
"CategoryNewEach32",
"CautionGlyph",
"CautionInvertedGlyph",
"Cda16",
"Cda20",
"Cda24",
Expand Down Expand Up @@ -1034,6 +1036,7 @@ Array [
"CircleDash20",
"CircleDash24",
"CircleDash32",
"CircleFillGlyph",
"CircleFilled16",
"CircleFilled20",
"CircleFilled24",
Expand All @@ -1042,6 +1045,7 @@ Array [
"CirclePacking20",
"CirclePacking24",
"CirclePacking32",
"CircleStrokeGlyph",
"Classification16",
"Classification20",
"Classification24",
Expand Down Expand Up @@ -1306,6 +1310,7 @@ Array [
"Credentials20",
"Credentials24",
"Credentials32",
"CriticalGlyph",
"Crop16",
"Crop20",
"Crop24",
Expand Down Expand Up @@ -2635,6 +2640,7 @@ Array [
"IncompleteError20",
"IncompleteError24",
"IncompleteError32",
"IncompleteGlyph",
"IncompleteWarning16",
"IncompleteWarning20",
"IncompleteWarning24",
Expand Down Expand Up @@ -4919,6 +4925,7 @@ Array [
"Sql20",
"Sql24",
"Sql32",
"SquareFillGlyph",
"StackLimitation16",
"StackLimitation20",
"StackLimitation24",
Expand Down Expand Up @@ -5563,6 +5570,7 @@ Array [
"UndefinedFilled20",
"UndefinedFilled24",
"UndefinedFilled32",
"UndefinedGlyph",
"Undo16",
"Undo20",
"Undo24",
Expand Down
10 changes: 5 additions & 5 deletions packages/carbon-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@carbon/react",
"private": true,
"description": "React components for the Carbon Design System",
"version": "0.7.0-rc.0",
"version": "0.7.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -41,11 +41,11 @@
},
"dependencies": {
"@carbon/feature-flags": "^0.5.0",
"@carbon/icons-react": "^10.35.0-rc.0",
"@carbon/styles": "^0.10.0-rc.0",
"@carbon/icons-react": "^10.35.0",
"@carbon/styles": "^0.10.0",
"@carbon/telemetry": "0.0.0-alpha.6",
"@ibm/plex": "6.0.0-next.6",
"carbon-components-react": "^7.39.0-rc.0"
"carbon-components-react": "^7.39.0"
},
"devDependencies": {
"@babel/core": "^7.14.2",
Expand All @@ -56,7 +56,7 @@
"@babel/preset-env": "^7.14.2",
"@babel/preset-react": "^7.13.13",
"@carbon/styles": "^0.10.0-rc.0",
"@carbon/themes": "^10.38.0-rc.0",
"@carbon/themes": "^10.38.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/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.28.0-rc.0",
"version": "10.28.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down
8 changes: 4 additions & 4 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.39.0-rc.0",
"version": "10.39.0",
"license": "Apache-2.0",
"main": "umd/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -81,9 +81,9 @@
"@babel/preset-react": "^7.13.13",
"@babel/runtime": "^7.14.0",
"@carbon/cli": "^10.25.0",
"@carbon/elements": "^10.38.0-rc.0",
"@carbon/icons-handlebars": "^10.35.0-rc.0",
"@carbon/icons-react": "^10.35.0-rc.0",
"@carbon/elements": "^10.38.0",
"@carbon/icons-handlebars": "^10.35.0",
"@carbon/icons-react": "^10.35.0",
"@carbon/test-utils": "^10.16.0",
"@frctl/fractal": "^1.1.0",
"@rollup/plugin-babel": "^5.3.0",
Expand Down
6 changes: 6 additions & 0 deletions packages/components/src/components/list-box/_list-box.scss
Original file line number Diff line number Diff line change
Expand Up @@ -754,6 +754,9 @@ $list-box-menu-width: rem(300px);
.#{$prefix}--list-box--up.#{$prefix}--dropdown--sm
.#{$prefix}--list-box__menu,
.#{$prefix}--list-box--up.#{$prefix}--list-box--sm
.#{$prefix}--list-box__menu,
.#{$prefix}--list-box--up
.#{$prefix}--list-box--sm
.#{$prefix}--list-box__menu {
bottom: 2rem;
}
Expand All @@ -766,6 +769,9 @@ $list-box-menu-width: rem(300px);
.#{$prefix}--list-box--up.#{$prefix}--dropdown--lg
.#{$prefix}--list-box__menu,
.#{$prefix}--list-box--up.#{$prefix}--list-box--lg
.#{$prefix}--list-box__menu,
.#{$prefix}--list-box--up
.#{$prefix}--list-box--lg
.#{$prefix}--list-box__menu {
bottom: 3rem;
}
Expand Down
1 change: 1 addition & 0 deletions packages/components/src/globals/scss/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@ $deprecations--message: 'Deprecated code was found, this code will be removed be
@import '../../components/pagination/unstable_pagination';
@import '../../components/ui-shell/ui-shell';
@import '../../components/popover/popover';
@import '../../components/treeview/treeview';

//-------------------------------------
// 🙈 Hidden (Not exposed on website)
Expand Down
14 changes: 7 additions & 7 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.38.0-rc.0",
"version": "10.38.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -35,14 +35,14 @@
"clean": "rimraf es lib umd && node tasks/clean.js"
},
"dependencies": {
"@carbon/colors": "^10.28.0-rc.0",
"@carbon/grid": "^10.31.0-rc.0",
"@carbon/icons": "^10.35.0-rc.0",
"@carbon/colors": "^10.28.0",
"@carbon/grid": "^10.31.0",
"@carbon/icons": "^10.35.0",
"@carbon/import-once": "^10.6.0",
"@carbon/layout": "^10.27.0-rc.0",
"@carbon/layout": "^10.27.0",
"@carbon/motion": "^10.20.0",
"@carbon/themes": "^10.38.0-rc.0",
"@carbon/type": "^10.31.0-rc.0"
"@carbon/themes": "^10.38.0",
"@carbon/type": "^10.31.0"
},
"devDependencies": {
"@carbon/cli": "^10.25.0",
Expand Down
4 changes: 2 additions & 2 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.31.0-rc.0",
"version": "10.31.0",
"license": "Apache-2.0",
"repository": {
"type": "git",
Expand Down Expand Up @@ -32,7 +32,7 @@
},
"dependencies": {
"@carbon/import-once": "^10.6.0",
"@carbon/layout": "^10.27.0-rc.0"
"@carbon/layout": "^10.27.0"
},
"devDependencies": {
"@carbon/cli": "^10.25.0",
Expand Down
2 changes: 1 addition & 1 deletion 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.24.0-rc.0",
"version": "0.24.0",
"license": "Apache-2.0",
"main": "src/index.js",
"repository": {
Expand Down
4 changes: 2 additions & 2 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.35.0-rc.0",
"version": "10.35.0",
"license": "Apache-2.0",
"main": "index.js",
"repository": {
Expand All @@ -27,7 +27,7 @@
},
"dependencies": {
"@carbon/icon-helpers": "^10.19.0",
"@carbon/icons": "^10.35.0-rc.0"
"@carbon/icons": "^10.35.0"
},
"devDependencies": {
"handlebars": "^4.0.12"
Expand Down
6 changes: 3 additions & 3 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.35.0-rc.0",
"version": "10.35.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -43,8 +43,8 @@
"prop-types": "^15.7.2"
},
"devDependencies": {
"@carbon/icon-build-helpers": "^0.24.0-rc.0",
"@carbon/icons": "^10.35.0-rc.0",
"@carbon/icon-build-helpers": "^0.24.0",
"@carbon/icons": "^10.35.0",
"rimraf": "^3.0.2"
},
"sideEffects": false
Expand Down
4 changes: 2 additions & 2 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.35.0-rc.0",
"version": "10.35.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -32,7 +32,7 @@
},
"devDependencies": {
"@carbon/cli-reporter": "^10.5.0",
"@carbon/icons": "^10.35.0-rc.0",
"@carbon/icons": "^10.35.0",
"fs-extra": "^8.1.0",
"prettier": "^2.2.1",
"rimraf": "^3.0.0",
Expand Down
Loading

0 comments on commit 9f9cfb0

Please sign in to comment.