Skip to content

Commit

Permalink
Merge branch 'master' into refactor/update-sass-module-entrypoints
Browse files Browse the repository at this point in the history
  • Loading branch information
kodiakhq[bot] authored Jan 25, 2021
2 parents 26587dc + 9e4485a commit b03b0b1
Show file tree
Hide file tree
Showing 51 changed files with 1,243 additions and 486 deletions.
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.
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
4 changes: 2 additions & 2 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 @@ -42,7 +42,7 @@
"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",
Expand Down
8 changes: 4 additions & 4 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.19.0-rc.0",
"version": "10.19.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -35,10 +35,10 @@
"clean": "rimraf css es lib umd scss index.scss"
},
"devDependencies": {
"@carbon/cli": "^10.18.0-rc.0",
"@carbon/cli": "^10.18.0",
"@carbon/cli-reporter": "^10.4.0",
"@carbon/scss-generator": "^10.12.0-rc.0",
"@carbon/test-utils": "^10.14.0-rc.0",
"@carbon/scss-generator": "^10.12.0",
"@carbon/test-utils": "^10.14.0",
"change-case": "^4.1.1",
"core-js": "^3.6.5",
"fs-extra": "^8.1.0",
Expand Down
17 changes: 16 additions & 1 deletion packages/components/docs/sass.md
Original file line number Diff line number Diff line change
Expand Up @@ -9580,6 +9580,7 @@ $field-01: if(
- **Used by**:
- [carbon--theme [mixin]](#carbon--theme-mixin)
- [snippet [mixin]](#snippet-mixin)
- [bx--snippet [mixin]](#bx--snippet-mixin)
- [date-picker [mixin]](#date-picker-mixin)
- [dropdown [mixin]](#dropdown-mixin)
- [file-uploader [mixin]](#file-uploader-mixin)
Expand Down Expand Up @@ -17777,13 +17778,15 @@ Code snippet base styles
position: relative;
width: 100%;
max-width: rem(600px);
background-color: $snippet-background-color;
background-color: $field-01;
}
```

</details>

- **Group**: [code-snippet](#code-snippet)
- **Requires**:
- [field-01 [variable]](#field-01-variable)
- **Used by**:
- [snippet [mixin]](#snippet-mixin)

Expand Down Expand Up @@ -23194,6 +23197,12 @@ Inline notification styles
@include carbon--breakpoint(max) {
max-width: rem(832px);
}

// Firefox HCM fix
@media screen and (prefers-contrast) {
outline-width: 1px;
outline-style: solid;
}
}

.#{$prefix}--inline-notification:not(.#{$prefix}--inline-notification--low-contrast)
Expand Down Expand Up @@ -23581,6 +23590,12 @@ Toast notification styles
@include carbon--breakpoint(max) {
width: rem(352px);
}

// Firefox HCM fix
@media screen and (prefers-contrast) {
outline-width: 1px;
outline-style: solid;
}
}

.#{$prefix}--toast-notification:not(.#{$prefix}--toast-notification--low-contrast)
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.27.0-rc.0",
"version": "10.27.0",
"license": "Apache-2.0",
"main": "umd/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -85,11 +85,11 @@
"@babel/preset-env": "^7.10.0",
"@babel/preset-react": "^7.10.0",
"@babel/runtime": "^7.10.0",
"@carbon/cli": "^10.18.0-rc.0",
"@carbon/elements": "^10.26.0-rc.0",
"@carbon/icons-handlebars": "^10.24.0-rc.0",
"@carbon/icons-react": "^10.24.0-rc.0",
"@carbon/test-utils": "^10.14.0-rc.0",
"@carbon/cli": "^10.18.0",
"@carbon/elements": "^10.26.0",
"@carbon/icons-handlebars": "^10.24.0",
"@carbon/icons-react": "^10.24.0",
"@carbon/test-utils": "^10.14.0",
"@frctl/fractal": "^1.1.0",
"adaro": "1.0.4",
"autoprefixer": "^9.7.4",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@
position: relative;
width: 100%;
max-width: rem(600px);
background-color: $snippet-background-color;
background-color: $field-01;
}
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,12 @@
@include carbon--breakpoint(max) {
max-width: rem(832px);
}

// Firefox HCM fix
@media screen and (prefers-contrast) {
outline-width: 1px;
outline-style: solid;
}
}

.#{$prefix}--inline-notification:not(.#{$prefix}--inline-notification--low-contrast)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,12 @@
@include carbon--breakpoint(max) {
width: rem(352px);
}

// Firefox HCM fix
@media screen and (prefers-contrast) {
outline-width: 1px;
outline-style: solid;
}
}

.#{$prefix}--toast-notification:not(.#{$prefix}--toast-notification--low-contrast)
Expand Down
1 change: 1 addition & 0 deletions packages/components/src/globals/scss/_theme-tokens.scss
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@ $checkbox-border-width: 2px !default;
/// @type Color
/// @access public
/// @group code-snippet
/// @deprecated
$snippet-background-color: $field-01 !default;

/// @type Color
Expand Down
20 changes: 10 additions & 10 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.26.0-rc.0",
"version": "10.26.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.19.0-rc.0",
"@carbon/grid": "^10.19.0-rc.0",
"@carbon/icons": "^10.24.0-rc.0",
"@carbon/import-once": "^10.5.0-rc.0",
"@carbon/layout": "^10.17.0-rc.0",
"@carbon/motion": "^10.12.0-rc.0",
"@carbon/themes": "^10.26.0-rc.0",
"@carbon/type": "^10.20.0-rc.0"
"@carbon/colors": "^10.19.0",
"@carbon/grid": "^10.19.0",
"@carbon/icons": "^10.24.0",
"@carbon/import-once": "^10.5.0",
"@carbon/layout": "^10.17.0",
"@carbon/motion": "^10.12.0",
"@carbon/themes": "^10.26.0",
"@carbon/type": "^10.20.0"
},
"devDependencies": {
"@carbon/cli": "^10.18.0-rc.0",
"@carbon/cli": "^10.18.0",
"fs-extra": "^8.1.0",
"klaw-sync": "^6.0.0",
"replace-in-file": "^3.4.2",
Expand Down
12 changes: 12 additions & 0 deletions packages/elements/src/__tests__/PublicAPI-test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
/**
* Copyright IBM Corp. 2018, 2018
*
* This source code is licensed under the Apache-2.0 license found in the
* LICENSE file in the root directory of this source tree.
*/

import * as CarbonElements from '../';

test('Public API should only change with a semver change', () => {
expect(Object.keys(CarbonElements).sort()).toMatchSnapshot();
});
Loading

0 comments on commit b03b0b1

Please sign in to comment.