Skip to content

Commit

Permalink
Merge branch 'main' into 10286-fix-popover-caret-styling
Browse files Browse the repository at this point in the history
  • Loading branch information
kodiakhq[bot] authored Feb 16, 2022
2 parents f8affac + 8a8a8f8 commit 9ffc2f0
Show file tree
Hide file tree
Showing 180 changed files with 923 additions and 1,163 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy-react-storybook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
with:
node-version: '16.x'
- name: Install dependencies
run: yarn install --immutable --immutable-cache --check-cache
run: yarn install --immutable --immutable-cache
- name: Build project
run: yarn build
- name: Install ibmcloud CLI
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 removed .yarn/cache/del-npm-3.0.0-e5f4cb556d-88192c1041.zip
Binary file not shown.
Binary file removed .yarn/cache/depd-npm-2.0.0-b6c51a4b43-abbe19c768.zip
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/kew-npm-0.7.0-313b8dfdfe-f21ccf2456.zip
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/tmp-npm-0.0.30-0fd2e9c3eb-d3e97e8e73.zip
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.
1 change: 1 addition & 0 deletions config/stylelint-config-carbon/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ module.exports = {
require.resolve('stylelint-config-standard'),
require.resolve('stylelint-no-unsupported-browser-features'),
require.resolve('stylelint-config-idiomatic-order'),
require.resolve('stylelint-config-standard-scss'),
require.resolve('./rules/possible-errors'),
require.resolve('./rules/limit-language-features'),
require.resolve('./rules/stylistic-issues'),
Expand Down
17 changes: 9 additions & 8 deletions config/stylelint-config-carbon/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,20 @@
"access": "public"
},
"peerDependencies": {
"stylelint": "^13.6.0"
"stylelint": "^14.3.0"
},
"dependencies": {
"stylelint-config-idiomatic-order": "^8.1.0",
"stylelint-config-prettier": "^8.0.2",
"stylelint-config-standard": "^22.0.0",
"stylelint-no-unsupported-browser-features": "^5.0.1",
"stylelint-order": "^4.1.0",
"stylelint-prettier": "^1.2.0",
"stylelint-scss": "^3.19.0"
"stylelint-config-prettier": "^9.0.3",
"stylelint-config-standard": "^24.0.0",
"stylelint-config-standard-scss": "^3.0.0",
"stylelint-no-unsupported-browser-features": "^5.0.2",
"stylelint-order": "^5.0.0",
"stylelint-prettier": "^2.0.0",
"stylelint-scss": "^4.1.0"
},
"devDependencies": {
"prettier": "^2.2.1",
"stylelint": "^13.13.1"
"stylelint": "^14.3.0"
}
}
19 changes: 19 additions & 0 deletions config/stylelint-config-carbon/plugins/scss.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ module.exports = {
// @-rule
// Disallow unknown at-rules. Should be used instead of stylelint's at-rule-no-unknown.
'scss/at-rule-no-unknown': true,
// Disallow parentheses in conditional @ rules (if, elsif, while)
'scss/at-rule-conditional-no-parentheses': OFF,

// $-variable
// Require a newline after the colon in $-variable declarations.
Expand Down Expand Up @@ -89,6 +91,8 @@ module.exports = {
'scss/double-slash-comment-inline': 'never',
// Require or disallow whitespace after the // in //-comments
'scss/double-slash-comment-whitespace-inside': OFF,
// Disallow empty comments. Should be used instead of the stylelint's comment-no-empty because the core rule ignores SCSS-like comments.
'scss/comment-no-empty': OFF,

// Declaration
// Require or disallow properties with - in their names to be in a form of a nested group.
Expand Down Expand Up @@ -116,4 +120,19 @@ module.exports = {
// Disallow redundant nesting selectors (&).
'scss/selector-no-redundant-nesting-selector': true,
},
overrides: [
{
files: [
'./packages/components/**/*.scss',
'./packages/grid/scss/*.scss',
'./packages/layout/scss/*.scss',
'./packages/motion/**/*.scss',
'./packages/type/scss/*.scss',
'./packages/import-once/**/*.scss',
],
rules: {
'scss/no-global-function-names': OFF,
},
},
],
};
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ module.exports = {
'color-named': 'never',
// Disallow hex colors.
'color-no-hex': OFF,
// Specify modern or legacy notation for applicable color-functions.
// Currently causes errors with sass
'color-function-notation': OFF,
'alpha-value-notation': OFF,

// Function
// Specify a blacklist of disallowed functions.
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"all-contributors-cli": "^6.19.0",
"cross-env": "^7.0.0",
"cross-spawn": "^7.0.0",
"doctoc": "^1.4.0",
"doctoc": "^2.0.0",
"eslint": "^7.28.0",
"fs-extra": "^10.0.0",
"glob": "^7.1.4",
Expand All @@ -69,7 +69,7 @@
"react": "^17.0.2",
"react-dom": "^17.0.2",
"rimraf": "^3.0.0",
"stylelint": "^13.13.1"
"stylelint": "^14.3.0"
},
"commitlint": {
"extends": [
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.14.0-rc.0",
"version": "0.14.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.7.0",
"@carbon/icons-react": "^10.46.0-rc.0",
"@carbon/styles": "^0.14.0-rc.0",
"@carbon/icons-react": "^10.46.0",
"@carbon/styles": "^0.14.0",
"@carbon/telemetry": "0.0.0-alpha.6",
"carbon-components": "^10.53.0-rc.0",
"carbon-components-react": "^7.53.0-rc.0",
"carbon-components": "^10.53.0",
"carbon-components-react": "^7.53.0",
"carbon-icons": "^7.0.7"
},
"devDependencies": {
Expand All @@ -58,7 +58,7 @@
"@babel/plugin-transform-react-constant-elements": "^7.16.7",
"@babel/preset-env": "^7.16.7",
"@babel/preset-react": "^7.16.7",
"@carbon/themes": "^10.51.0-rc.0",
"@carbon/themes": "^10.51.0",
"@rollup/plugin-babel": "^5.3.0",
"@rollup/plugin-commonjs": "^21.0.0",
"@rollup/plugin-node-resolve": "^13.0.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
// This source code is licensed under the Apache-2.0 license found in the
// LICENSE file in the root directory of this source tree.
//

.demo-icon-example {
display: flex;
width: 10rem;
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.33.0-rc.0",
"version": "10.33.0",
"license": "Apache-2.0",
"bin": {
"carbon-cli": "./bin/carbon-cli.js"
Expand Down
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.36.0-rc.0",
"version": "10.36.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -36,7 +36,7 @@
"clean": "rimraf css es lib umd scss index.scss"
},
"devDependencies": {
"@carbon/cli": "^10.33.0-rc.0",
"@carbon/cli": "^10.33.0",
"@carbon/cli-reporter": "^10.5.0",
"@carbon/scss-generator": "^10.13.0",
"@carbon/test-utils": "^10.21.0",
Expand Down
33 changes: 1 addition & 32 deletions packages/components/gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,6 @@ const cloptions = commander
.option('-ds, --use-dart-sass', 'Uses dart-sass instead of node-sass')
.parse(process.argv);

// Axe A11y Test
const axe = require('gulp-axe-webdriver');

const promisePortSassDevBuild = portscanner.findAPortNotInUse(
cloptions.portSassDevBuild,
cloptions.portSassDevBuild + 100
Expand Down Expand Up @@ -643,35 +640,7 @@ const startTest = (done) => {

gulp.task('test:unit', gulp.series('html:source', startTest));

const startAccessibilityTest = (done) => {
const componentName = cloptions.name;
const options = {
a11yCheckOptions: {
rules: {
'html-has-lang': { enabled: false },
bypass: { enabled: false },
'image-alt': { enabled: false },
},
},
verbose: true,
showOnlyViolations: true,
exclude: '.offleft, #flex-col, #flex-row',
tags: ['wcag2aa', 'wcag2a'],
folderOutputReport: !componentName ? 'tests/axe/allHtml' : 'tests/axe',
saveOutputIn: !componentName
? `a11y-html.json`
: `a11y-${componentName}.json`,
urls: !componentName
? ['http://localhost:3000']
: [`http://localhost:3000/component/${componentName}/`],
};

return axe(options, done);
};

gulp.task('test:a11y', gulp.series('sass:compiled', startAccessibilityTest));

gulp.task('test', gulp.parallel('test:unit', 'test:a11y'));
gulp.task('test', gulp.parallel('test:unit'));

// Watch Tasks
gulp.task('watch', () => {
Expand Down
13 changes: 6 additions & 7 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.53.0-rc.0",
"version": "10.53.0",
"license": "Apache-2.0",
"main": "umd/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -77,10 +77,10 @@
"@babel/preset-env": "^7.16.7",
"@babel/preset-react": "^7.16.7",
"@babel/runtime": "^7.16.7",
"@carbon/cli": "^10.33.0-rc.0",
"@carbon/elements": "^10.52.0-rc.0",
"@carbon/icons-handlebars": "^10.46.0-rc.0",
"@carbon/icons-react": "^10.46.0-rc.0",
"@carbon/cli": "^10.33.0",
"@carbon/elements": "^10.52.0",
"@carbon/icons-handlebars": "^10.46.0",
"@carbon/icons-react": "^10.46.0",
"@carbon/test-utils": "^10.21.0",
"@frctl/fractal": "^1.1.0",
"@rollup/plugin-babel": "^5.3.0",
Expand Down Expand Up @@ -109,11 +109,10 @@
"del": "~6.0.0",
"diff": "^5.0.0",
"express-handlebars": "^5.2.1",
"fancy-log": "^1.3.0",
"fancy-log": "^2.0.0",
"glob": "^7.1.2",
"globby": "^11.0.2",
"gulp": "^4.0.0",
"gulp-axe-webdriver": "^3.1.0",
"gulp-babel": "^8.0.0",
"gulp-header": "^2.0.0",
"gulp-jsdoc3": "^2.0.0",
Expand Down
2 changes: 2 additions & 0 deletions packages/components/src/components/accordion/_keyframes.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
0% {
@include content-visible;
}

100% {
@include content-hidden;
}
Expand All @@ -23,6 +24,7 @@
0% {
@include content-hidden;
}

100% {
@include content-visible;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
@import '../../globals/scss/helper-mixins';
@import '../../globals/scss/vendor/@carbon/elements/scss/import-once/import-once';
@import '../form/form';
@import 'flatpickr.scss';
@import './flatpickr';

@include flatpickr;

Expand Down
3 changes: 3 additions & 0 deletions packages/components/src/components/loading/_keyframes.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
0% {
transform: rotate(0deg);
}

100% {
transform: rotate(360deg);
}
Expand All @@ -34,6 +35,7 @@
0% {
stroke-dashoffset: loading-progress($circumference, 0);
}

100% {
stroke-dashoffset: loading-progress($circumference, 81);
}
Expand All @@ -43,6 +45,7 @@
0% {
stroke-dashoffset: loading-progress($circumference, 81);
}

100% {
stroke-dashoffset: loading-progress($circumference, 0);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
}

.#{$prefix}--number input[type='number'] {
@include type-style('body-short-01');
@include type-style('code-01');
@include focus-outline('reset');

display: inline-flex;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@

.#{$prefix}--overflow-menu-options--light {
background-color: $field-02;

&::after {
background-color: $field-02;
}
Expand Down Expand Up @@ -161,6 +162,7 @@
&[data-floating-menu-direction='top']::after {
width: rem(32px);
}

&[data-floating-menu-direction='left']::after,
&[data-floating-menu-direction='right']::after {
height: rem(32px);
Expand All @@ -174,6 +176,7 @@
&[data-floating-menu-direction='top']::after {
width: rem(48px);
}

&[data-floating-menu-direction='left']::after,
&[data-floating-menu-direction='right']::after {
height: rem(48px);
Expand Down
1 change: 1 addition & 0 deletions packages/components/src/components/tag/_tag.scss
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,7 @@
cursor: pointer;
transition: background-color $duration--fast-01 motion(standard, productive),
box-shadow $duration--fast-01 motion(standard, productive);

svg {
fill: currentColor;
}
Expand Down
1 change: 1 addition & 0 deletions packages/components/src/components/ui-shell/_side-nav.scss
Original file line number Diff line number Diff line change
Expand Up @@ -419,6 +419,7 @@
position: relative;
background-color: $shell-side-nav-bg-04;
color: $ibm-color__gray-100;

&::before {
position: absolute;
top: 0;
Expand Down
Loading

0 comments on commit 9ffc2f0

Please sign in to comment.