Skip to content

Commit

Permalink
Merge branch 'master' into 5639-modal-close-button-alt-text
Browse files Browse the repository at this point in the history
  • Loading branch information
tw15egan authored Mar 25, 2020
2 parents 5300606 + c851c7a commit 9b4b9d0
Show file tree
Hide file tree
Showing 25 changed files with 75 additions and 54 deletions.
4 changes: 2 additions & 2 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.8.0",
"version": "10.8.1",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -34,7 +34,7 @@
"@carbon/bundler": "^10.6.0",
"@carbon/cli-reporter": "^10.3.0",
"@carbon/scss-generator": "^10.6.0",
"@carbon/test-utils": "^10.7.0",
"@carbon/test-utils": "^10.7.1",
"change-case": "^4.1.1",
"core-js": "^3.0.1",
"fs-extra": "^8.1.0",
Expand Down
10 changes: 5 additions & 5 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.10.1",
"version": "10.10.2",
"license": "Apache-2.0",
"main": "umd/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -79,10 +79,10 @@
"@babel/preset-env": "^7.7.7",
"@babel/preset-react": "^7.7.4",
"@babel/runtime": "^7.7.7",
"@carbon/elements": "^10.10.1",
"@carbon/icons-handlebars": "^10.9.1",
"@carbon/icons-react": "^10.9.1",
"@carbon/test-utils": "^10.7.0",
"@carbon/elements": "^10.10.2",
"@carbon/icons-handlebars": "^10.9.2",
"@carbon/icons-react": "^10.9.2",
"@carbon/test-utils": "^10.7.1",
"@frctl/fractal": "^1.1.0",
"adaro": "1.0.4",
"autoprefixer": "^9.7.4",
Expand Down
8 changes: 8 additions & 0 deletions packages/components/src/components/dropdown/_dropdown.scss
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,10 @@
overflow-y: auto;
}

.#{$prefix}--dropdown--light .#{$prefix}--dropdown-list {
background-color: $field-02;
}

.#{$prefix}--dropdown:not(.#{$prefix}--dropdown--open)
.#{$prefix}--dropdown-item {
visibility: hidden;
Expand Down Expand Up @@ -238,6 +242,10 @@
}
}

.#{$prefix}--dropdown--light .#{$prefix}--dropdown-link {
border-top-color: $decorative-01;
}

.#{$prefix}--dropdown--sm .#{$prefix}--dropdown-link {
padding-top: rem(7px);
padding-bottom: rem(7px);
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.10.1",
"version": "10.10.2",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -31,14 +31,14 @@
"clean": "rimraf es lib umd && node tasks/clean.js"
},
"dependencies": {
"@carbon/colors": "^10.8.0",
"@carbon/grid": "^10.9.1",
"@carbon/icons": "^10.9.1",
"@carbon/colors": "^10.8.1",
"@carbon/grid": "^10.9.2",
"@carbon/icons": "^10.9.2",
"@carbon/import-once": "^10.3.0",
"@carbon/layout": "^10.8.1",
"@carbon/layout": "^10.8.2",
"@carbon/motion": "^10.6.0",
"@carbon/themes": "^10.10.1",
"@carbon/type": "^10.9.1"
"@carbon/themes": "^10.10.2",
"@carbon/type": "^10.9.2"
},
"devDependencies": {
"@carbon/bundler": "^10.6.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.9.1",
"version": "10.9.2",
"license": "Apache-2.0",
"repository": "https://github.com/carbon-design-system/carbon/tree/master/packages/grid",
"bugs": "https://github.com/carbon-design-system/carbon/issues",
Expand All @@ -28,7 +28,7 @@
},
"dependencies": {
"@carbon/import-once": "^10.3.0",
"@carbon/layout": "^10.8.1"
"@carbon/layout": "^10.8.2"
},
"devDependencies": {
"@carbon/bundler": "^10.6.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.4.0",
"version": "0.4.1",
"license": "Apache-2.0",
"main": "src/index.js",
"repository": "https://github.com/carbon-design-system/carbon/tree/master/packages/icon-build-helpers",
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.9.1",
"version": "10.9.2",
"license": "Apache-2.0",
"main": "index.js",
"repository": "https://github.com/carbon-design-system/carbon/tree/master/packages/icons-handlebars",
Expand All @@ -23,7 +23,7 @@
},
"dependencies": {
"@carbon/icon-helpers": "^10.6.0",
"@carbon/icons": "^10.9.1"
"@carbon/icons": "^10.9.2"
},
"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.9.1",
"version": "10.9.2",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -32,8 +32,8 @@
"@carbon/icon-helpers": "^10.6.0"
},
"devDependencies": {
"@carbon/icon-build-helpers": "^0.4.0",
"@carbon/icons": "^10.9.1"
"@carbon/icon-build-helpers": "^0.4.1",
"@carbon/icons": "^10.9.2"
},
"sideEffects": false
}
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.9.1",
"version": "10.9.2",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand All @@ -28,7 +28,7 @@
},
"devDependencies": {
"@carbon/cli-reporter": "^10.3.0",
"@carbon/icons": "^10.9.1",
"@carbon/icons": "^10.9.2",
"fs-extra": "^8.1.0",
"prettier": "^1.19.1",
"rimraf": "^3.0.0",
Expand Down
4 changes: 2 additions & 2 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.9.1",
"version": "10.9.2",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -34,6 +34,6 @@
"prepublishOnly": "yarn build"
},
"devDependencies": {
"@carbon/icon-build-helpers": "^0.4.0"
"@carbon/icon-build-helpers": "^0.4.1"
}
}
4 changes: 2 additions & 2 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.8.1",
"version": "10.8.2",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand All @@ -28,7 +28,7 @@
"@carbon/bundler": "^10.6.0",
"@carbon/cli-reporter": "^10.3.0",
"@carbon/scss-generator": "^10.6.0",
"@carbon/test-utils": "^10.7.0",
"@carbon/test-utils": "^10.7.1",
"core-js": "^3.4.0",
"rimraf": "^3.0.0"
},
Expand Down
6 changes: 3 additions & 3 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": "10.9.0",
"version": "10.9.1",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -32,8 +32,8 @@
"@carbon/icon-helpers": "^10.6.0"
},
"devDependencies": {
"@carbon/icon-build-helpers": "^0.4.0",
"@carbon/pictograms": "^10.9.0"
"@carbon/icon-build-helpers": "^0.4.1",
"@carbon/pictograms": "^10.9.1"
},
"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": "10.9.0",
"version": "10.9.1",
"license": "Apache-2.0",
"repository": "https://github.com/carbon-design-system/carbon/tree/master/packages/pictograms",
"bugs": "https://github.com/carbon-design-system/carbon/issues",
Expand All @@ -25,7 +25,7 @@
"prepublishOnly": "yarn build"
},
"devDependencies": {
"@carbon/icon-build-helpers": "^0.4.0",
"@carbon/icon-build-helpers": "^0.4.1",
"rimraf": "^3.0.0"
}
}
6 changes: 3 additions & 3 deletions packages/react-hooks/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/react-hooks",
"private": true,
"version": "10.4.1",
"version": "10.4.2",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -30,7 +30,7 @@
"@babel/core": "^7.5.5",
"@babel/preset-env": "^7.7.7",
"@babel/preset-react": "^7.7.4",
"@carbon/test-utils": "^10.7.0",
"@carbon/test-utils": "^10.7.1",
"@storybook/addon-actions": "^5.1.11",
"@storybook/addon-links": "^5.1.11",
"@storybook/addon-storysource": "^5.2.0",
Expand All @@ -39,7 +39,7 @@
"autoprefixer": "^9.7.4",
"babel-loader": "^8.0.6",
"browserslist-config-carbon": "^10.4.0",
"carbon-components": "^10.10.1",
"carbon-components": "^10.10.2",
"css-loader": "^3.4.2",
"node-sass": "^4.13.1",
"postcss-loader": "^3.0.0",
Expand Down
8 changes: 4 additions & 4 deletions packages/react/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "carbon-components-react",
"description": "The Carbon Design System is IBM’s open-source design system for products and experiences.",
"version": "7.10.1",
"version": "7.10.2",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -38,7 +38,7 @@
"react-dom": "^16.8.6"
},
"dependencies": {
"@carbon/icons-react": "^10.9.1",
"@carbon/icons-react": "^10.9.2",
"classnames": "2.2.6",
"downshift": "^1.31.14",
"flatpickr": "4.6.1",
Expand All @@ -64,7 +64,7 @@
"@babel/plugin-transform-object-assign": "^7.7.4",
"@babel/preset-env": "^7.7.7",
"@babel/preset-react": "^7.7.4",
"@carbon/test-utils": "^10.7.0",
"@carbon/test-utils": "^10.7.1",
"@storybook/addon-a11y": "^5.3.9",
"@storybook/addon-actions": "^5.3.9",
"@storybook/addon-info": "^5.3.9",
Expand All @@ -80,7 +80,7 @@
"babel-plugin-react-docgen": "^4.0.0",
"babel-plugin-transform-inline-environment-variables": "^0.4.0",
"browserslist-config-carbon": "^10.4.0",
"carbon-components": "^10.10.1",
"carbon-components": "^10.10.2",
"carbon-icons": "^7.0.5",
"chalk": "^2.3.0",
"cli-table": "^0.3.0",
Expand Down
10 changes: 5 additions & 5 deletions packages/sketch/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@carbon/sketch",
"private": true,
"description": "Tooling for generating a sketch plugin to bring code to design",
"version": "10.10.1",
"version": "10.10.2",
"license": "Apache-2.0",
"repository": "https://github.com/carbon-design-system/carbon/tree/master/packages/sketch",
"bugs": "https://github.com/carbon-design-system/carbon/issues",
Expand All @@ -25,11 +25,11 @@
},
"dependencies": {
"@babel/polyfill": "^7.7.0",
"@carbon/colors": "^10.8.0",
"@carbon/colors": "^10.8.1",
"@carbon/icon-helpers": "^10.6.0",
"@carbon/icons": "^10.9.1",
"@carbon/themes": "^10.10.1",
"@carbon/type": "^10.9.1",
"@carbon/icons": "^10.9.2",
"@carbon/themes": "^10.10.2",
"@carbon/type": "^10.9.2",
"@skpm/builder": "^0.7.0",
"color-string": "^1.5.3",
"skpm": "^1.2.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/test-utils/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/test-utils",
"private": true,
"version": "10.7.0",
"version": "10.7.1",
"license": "Apache-2.0",
"repository": "https://github.com/carbon-design-system/carbon/tree/master/packages/test-utils",
"bugs": "https://github.com/carbon-design-system/carbon/issues",
Expand Down
10 changes: 5 additions & 5 deletions packages/themes/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/themes",
"description": "Themes for applying color in the Carbon Design System",
"version": "10.10.1",
"version": "10.10.2",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand All @@ -24,15 +24,15 @@
"build": "yarn clean && bundler bundle src/index.js --name CarbonThemes && node tasks/build.js && bundler check \"scss/*.scss\" && bundler sassdoc \"scss/**/*.scss\""
},
"dependencies": {
"@carbon/colors": "^10.8.0",
"@carbon/layout": "^10.8.1",
"@carbon/type": "^10.9.1",
"@carbon/colors": "^10.8.1",
"@carbon/layout": "^10.8.2",
"@carbon/type": "^10.9.2",
"color": "^3.1.2"
},
"devDependencies": {
"@carbon/cli-reporter": "^10.3.0",
"@carbon/scss-generator": "^10.6.0",
"@carbon/test-utils": "^10.7.0",
"@carbon/test-utils": "^10.7.1",
"change-case": "^4.1.1",
"core-js": "^3.0.1",
"fs-extra": "^8.1.0",
Expand Down
2 changes: 2 additions & 0 deletions packages/themes/src/g10.js
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,8 @@ export const disabled03 = gray50;

export const highlight = blue20;

export const decorative01 = gray20;

export const skeleton01 = '#e5e5e5';
export const skeleton02 = gray30;

Expand Down
2 changes: 2 additions & 0 deletions packages/themes/src/g100.js
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,8 @@ export const disabled03 = gray50;

export const highlight = blue80;

export const decorative01 = gray70;

export const skeleton01 = '#353535';
export const skeleton02 = gray80;

Expand Down
Loading

0 comments on commit 9b4b9d0

Please sign in to comment.