Skip to content

Commit

Permalink
Merge branch 'main' into modal-overflow-indicator-safari-media-query
Browse files Browse the repository at this point in the history
  • Loading branch information
kodiakhq[bot] authored May 4, 2021
2 parents dd66d8a + 92900da commit 6866e28
Show file tree
Hide file tree
Showing 231 changed files with 2,522 additions and 2,584 deletions.
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 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 not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion codemods/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"react"
],
"dependencies": {
"@babel/preset-env": "^7.12.13",
"@babel/preset-env": "^7.14.0",
"jscodeshift": "^0.12.0"
}
}
18 changes: 9 additions & 9 deletions config/jest-config-carbon/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,17 @@
"react"
],
"dependencies": {
"@babel/core": "^7.10.0",
"@babel/plugin-proposal-class-properties": "^7.7.4",
"@babel/plugin-proposal-export-default-from": "^7.7.4",
"@babel/plugin-proposal-export-namespace-from": "^7.7.4",
"@babel/plugin-transform-runtime": "^7.10.0",
"@babel/preset-env": "^7.10.0",
"@babel/preset-react": "^7.10.0",
"@babel/runtime": "^7.10.0",
"@babel/core": "^7.14.0",
"@babel/plugin-proposal-class-properties": "^7.13.0",
"@babel/plugin-proposal-export-default-from": "^7.12.13",
"@babel/plugin-proposal-export-namespace-from": "^7.12.13",
"@babel/plugin-transform-runtime": "^7.13.15",
"@babel/preset-env": "^7.14.0",
"@babel/preset-react": "^7.13.13",
"@babel/runtime": "^7.14.0",
"accessibility-checker": "^3.1.1",
"axe-core": "^4.1.1",
"babel-jest": "^26.0.1",
"babel-jest": "^26.6.3",
"chalk": "^4.1.0",
"enzyme": "^3.10.0",
"enzyme-adapter-react-16": "^1.14.0",
Expand Down
6 changes: 3 additions & 3 deletions config/storybook-preset-carbon/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "storybook-preset-carbon",
"private": true,
"version": "0.4.0",
"version": "0.5.0",
"license": "Apache-2.0",
"main": "index.js",
"repository": {
Expand All @@ -27,8 +27,8 @@
"react-dom": "^16.8.6 || ^17.0.1"
},
"dependencies": {
"@babel/cli": "^7.12.10",
"@babel/core": "^7.12.10",
"@babel/cli": "^7.13.16",
"@babel/core": "^7.14.0",
"@storybook/addon-actions": "^5.3.19",
"@storybook/addon-docs": "^5.3.19",
"@storybook/addon-knobs": "^5.3.19",
Expand Down
2 changes: 1 addition & 1 deletion config/stylelint-config-carbon/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ module.exports = {
extends: [
require.resolve('stylelint-config-standard'),
require.resolve('stylelint-no-unsupported-browser-features'),
require.resolve('stylelint-config-rational-order'),
require.resolve('stylelint-config-idiomatic-order'),
require.resolve('./rules/possible-errors'),
require.resolve('./rules/limit-language-features'),
require.resolve('./rules/stylistic-issues'),
Expand Down
4 changes: 2 additions & 2 deletions config/stylelint-config-carbon/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "stylelint-config-carbon",
"description": "Stylelint configuration for Carbon",
"version": "1.4.0",
"version": "1.5.0",
"license": "Apache-2.0",
"main": "index.js",
"repository": {
Expand All @@ -26,8 +26,8 @@
"stylelint": "^13.6.0"
},
"dependencies": {
"stylelint-config-idiomatic-order": "^8.1.0",
"stylelint-config-prettier": "^8.0.1",
"stylelint-config-rational-order": "^0.1.2",
"stylelint-config-standard": "^20.0.0",
"stylelint-no-unsupported-browser-features": "^4.0.0",
"stylelint-order": "^4.1.0",
Expand Down
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,14 @@
"react-test-renderer": "~16.9.0"
},
"devDependencies": {
"@babel/core": "^7.10.0",
"@babel/plugin-proposal-class-properties": "^7.7.4",
"@babel/plugin-proposal-export-default-from": "^7.7.4",
"@babel/plugin-proposal-export-namespace-from": "^7.7.4",
"@babel/plugin-transform-runtime": "^7.10.0",
"@babel/preset-env": "^7.10.0",
"@babel/preset-react": "^7.10.0",
"@babel/runtime": "^7.10.0",
"@babel/core": "^7.14.0",
"@babel/plugin-proposal-class-properties": "^7.13.0",
"@babel/plugin-proposal-export-default-from": "^7.12.13",
"@babel/plugin-proposal-export-namespace-from": "^7.12.13",
"@babel/plugin-transform-runtime": "^7.13.15",
"@babel/preset-env": "^7.14.0",
"@babel/preset-react": "^7.13.13",
"@babel/runtime": "^7.14.0",
"@carbon/cli": "workspace:packages/cli",
"@commitlint/cli": "^8.3.5",
"@commitlint/config-conventional": "^8.3.4",
Expand Down
12 changes: 6 additions & 6 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.1.0",
"version": "0.2.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -39,18 +39,18 @@
},
"dependencies": {
"@carbon/feature-flags": "^0.3.0",
"@carbon/icons-react": "^10.30.0",
"@carbon/styles": "^0.4.0",
"@carbon/icons-react": "^10.31.0",
"@carbon/styles": "^0.5.0",
"@carbon/telemetry": "0.0.0-alpha.6",
"carbon-components-react": "^7.33.0"
"carbon-components-react": "^7.34.0"
},
"devDependencies": {
"@babel/core": "^7.13.14",
"@babel/core": "^7.14.0",
"@babel/plugin-proposal-class-properties": "^7.13.0",
"@babel/plugin-proposal-export-default-from": "^7.12.13",
"@babel/plugin-proposal-export-namespace-from": "^7.12.13",
"@babel/plugin-transform-react-constant-elements": "^7.13.13",
"@babel/preset-env": "^7.13.12",
"@babel/preset-env": "^7.14.0",
"@babel/preset-react": "^7.13.13",
"@rollup/plugin-babel": "^5.3.0",
"@rollup/plugin-commonjs": "^18.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"access": "public"
},
"dependencies": {
"@babel/core": "^7.12.13",
"@babel/core": "^7.14.0",
"@carbon/cli-reporter": "^10.4.0",
"@octokit/plugin-retry": "^3.0.7",
"@octokit/plugin-throttling": "^2.6.0",
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.23.0",
"version": "10.24.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down
32 changes: 15 additions & 17 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.33.0",
"version": "10.34.0",
"license": "Apache-2.0",
"main": "umd/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -66,7 +66,6 @@
"semantic-release": "semantic-release"
},
"resolutions": {
"babel-core": "7.0.0-bridge.0",
"freshy": ">= 1.0.3"
},
"dependencies": {
Expand All @@ -76,18 +75,18 @@
"warning": "^3.0.0"
},
"devDependencies": {
"@babel/core": "^7.10.0",
"@babel/plugin-proposal-class-properties": "^7.7.4",
"@babel/plugin-proposal-object-rest-spread": "^7.10.0",
"@babel/plugin-transform-modules-umd": "^7.9.0",
"@babel/plugin-transform-runtime": "^7.10.0",
"@babel/preset-env": "^7.10.0",
"@babel/preset-react": "^7.10.0",
"@babel/runtime": "^7.10.0",
"@babel/core": "^7.14.0",
"@babel/plugin-proposal-class-properties": "^7.13.0",
"@babel/plugin-proposal-object-rest-spread": "^7.13.8",
"@babel/plugin-transform-modules-umd": "^7.14.0",
"@babel/plugin-transform-runtime": "^7.13.15",
"@babel/preset-env": "^7.14.0",
"@babel/preset-react": "^7.13.13",
"@babel/runtime": "^7.14.0",
"@carbon/cli": "^10.22.0",
"@carbon/elements": "^10.32.0",
"@carbon/icons-handlebars": "^10.30.0",
"@carbon/icons-react": "^10.30.0",
"@carbon/elements": "^10.33.0",
"@carbon/icons-handlebars": "^10.31.0",
"@carbon/icons-react": "^10.31.0",
"@carbon/test-utils": "^10.15.0",
"@frctl/fractal": "^1.1.0",
"@rollup/plugin-babel": "^5.2.2",
Expand All @@ -97,11 +96,10 @@
"@rollup/plugin-virtual": "^2.0.3",
"adaro": "1.0.4",
"autoprefixer": "^9.7.4",
"babel-core": "^7.0.0-bridge.0",
"babel-loader": "^8.1.0",
"babel-loader": "^8.2.2",
"babel-plugin-dev-expression": "^0.2.2",
"babel-plugin-istanbul": "^6.0.0",
"babel-plugin-rewire": "^1.1.0",
"babel-plugin-rewire": "^1.2.0",
"bluebird": "~3.1.1",
"browser-sync": "^2.26.3",
"browserslist-config-carbon": "^10.6.1",
Expand Down Expand Up @@ -172,7 +170,7 @@
"sass-loader": "^8.0.2",
"serve-static": "^1.13.0",
"style-loader": "^1.1.3",
"terser": "^4.6.3",
"terser": "^5.7.0",
"terser-webpack-plugin": "^2.3.2",
"through2": "^3.0.0",
"vinyl-named": "^1.1.0",
Expand Down
41 changes: 17 additions & 24 deletions packages/components/src/components/accordion/_accordion.scss
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@

position: relative;
display: flex;
width: 100%;
min-height: rem(40px);
flex-direction: $accordion-flex-direction;
align-items: flex-start;
justify-content: $accordion-justify-content;
width: 100%;
min-height: rem(40px);
margin: 0;
padding: rem(10px) 0;
margin: 0;
color: $text-primary;
cursor: pointer;
transition: background-color motion(standard, productive) $duration--fast-02;
Expand Down Expand Up @@ -109,22 +109,16 @@

.#{$prefix}--accordion__arrow {
@include focus-outline('reset');

width: 1rem;
height: 1rem;
// Without flex basis and flex shrink being set here, our icon width can go
// <16px and cause the icon to render in the incorrect artboard size
flex: 0 0 1rem;
width: 1rem;
height: 1rem;
margin: $accordion-arrow-margin;
fill: $icon-primary;
transform: rotate(-270deg) #{'/*rtl:ignore*/'};
transition: all $duration--fast-02 motion(standard, productive);
fill: $icon-primary;

// Windows, Firefox HCM Fix
@media screen and (-ms-high-contrast: active),
screen and (prefers-contrast) {
// `ButtonText` is a CSS2 system color to help improve colors in HCM
fill: ButtonText;
}
}

.#{$prefix}--accordion__title {
Expand Down Expand Up @@ -198,15 +192,8 @@
}

.#{$prefix}--accordion__arrow {
transform: rotate(-90deg) #{'/*rtl:ignore*/'};
fill: $icon-primary;

// Windows, Firefox HCM Fix
@media screen and (-ms-high-contrast: active),
screen and (prefers-contrast) {
// `ButtonText` is a CSS2 system color to help improve colors in HCM
fill: ButtonText;
}
transform: rotate(-90deg) #{'/*rtl:ignore*/'};
}
}

Expand All @@ -218,15 +205,15 @@

.#{$prefix}--accordion.#{$prefix}--skeleton .#{$prefix}--accordion__arrow {
cursor: default;
pointer-events: none;
fill: $icon-primary;
pointer-events: none;

&:hover,
&:focus,
&:active {
border: none;
outline: none;
cursor: default;
outline: none;
}
}

Expand All @@ -244,13 +231,19 @@
.#{$prefix}--accordion__heading:focus
.#{$prefix}--accordion__arrow {
border: none;
outline: none;
cursor: default;
outline: none;
}

.#{$prefix}--accordion__title.#{$prefix}--skeleton__text {
margin-bottom: 0;
}

// Windows HCM fix
.#{$prefix}--accordion__arrow,
.#{$prefix}--accordion__item--active .#{$prefix}--accordion__arrow {
@include high-contrast-mode('icon-fill');
}
}

@include exports('accordion') {
Expand Down
4 changes: 2 additions & 2 deletions packages/components/src/components/accordion/_keyframes.scss
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
@mixin content-visible {
height: 100%;
visibility: inherit;
opacity: 1;
visibility: inherit;
}

@mixin content-hidden {
height: 0;
visibility: hidden;
opacity: 0;
visibility: hidden;
}

@keyframes collapse-accordion {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,9 @@
width: rem(12px);
height: 1px;
background: $link-primary-hover;
content: '';
opacity: 0;
transition: opacity $duration--fast-01 motion(standard, productive);
content: '';
}
}

Expand All @@ -113,8 +113,8 @@

.#{$prefix}--breadcrumb-item .#{$prefix}--overflow-menu__icon {
position: relative;
transform: translateY(4px);
fill: $link-primary;
transform: translateY(4px);
}

.#{$prefix}--breadcrumb-item
Expand All @@ -133,11 +133,11 @@
left: $caret-size * 2;
width: 0;
height: 0;
margin: 0 auto;
background: transparent;
border-right: $caret-size solid transparent;
border-bottom: $caret-size solid $field;
border-left: $caret-size solid transparent;
margin: 0 auto;
background: transparent;
}

// Skeleton State
Expand Down
Loading

0 comments on commit 6866e28

Please sign in to comment.