Skip to content
This repository has been archived by the owner on Mar 8, 2023. It is now read-only.

chore(dependencies): upgrade Carbon #619

Merged
merged 4 commits into from
Apr 6, 2021
Merged

chore(dependencies): upgrade Carbon #619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9e545b5
chore(dependencies): upgrade Carbon
asudoh Apr 5, 2021
ecf7964
Merge branch 'master' into carbon-10-32
asudoh Apr 5, 2021
d310fbb
Merge branch 'master' into carbon-10-32
jeffchew Apr 5, 2021
7523dcb
Merge branch 'master' into carbon-10-32
asudoh Apr 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file renamed .../offline-mirror/@carbon-icons-10.28.0.tgz → .../offline-mirror/@carbon-icons-10.29.0.tgz
View file
Open in desktop
Binary file not shown.
Binary file renamed ...ne-mirror/@carbon-icons-react-10.28.0.tgz → ...ne-mirror/@carbon-icons-react-10.29.0.tgz
View file
Open in desktop
Binary file not shown.
Binary file renamed ...line-mirror/@carbon-icons-vue-10.28.0.tgz → ...line-mirror/@carbon-icons-vue-10.29.0.tgz
View file
Open in desktop
Binary file not shown.
Binary file removed .yarn/offline-mirror/carbon-components-10.31.0.tgz
View file
Open in desktop
Binary file not shown.
Binary file added .yarn/offline-mirror/carbon-components-10.32.0.tgz
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion examples/codesandbox/angular/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"@angular/platform-browser-dynamic": "^8.0.0",
"@angular/router": "^8.0.0",
"@babel/runtime": "^7.8.0",
"carbon-components": "~10.31.0",
"carbon-components": "~10.32.0",
"carbon-web-components": "^1.0.0",
"lit-element": "~2.2.0",
"lit-html": "^1.2.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/codesandbox/basic/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"start": "webpack serve"
},
"dependencies": {
"carbon-components": "~10.31.0",
"carbon-components": "~10.32.0",
"carbon-web-components": "^1.0.0",
"lit-element": "~2.2.0",
"lit-html": "^1.2.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/codesandbox/data-table/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"build": "parcel build index.html"
},
"dependencies": {
"carbon-components": "~10.31.0",
"carbon-components": "~10.32.0",
"carbon-web-components": "^1.0.0",
"lit-element": "^2.2.0",
"lit-html": "^1.1.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/codesandbox/form/angular/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"@angular/platform-browser-dynamic": "~8.1.0",
"@angular/router": "~8.1.0",
"@babel/runtime": "^7.8.0",
"carbon-components": "~10.31.0",
"carbon-components": "~10.32.0",
"carbon-web-components": "^1.0.0",
"lit-element": "~2.2.0",
"lit-html": "^1.2.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/codesandbox/form/basic/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"start": "webpack serve"
},
"dependencies": {
"carbon-components": "~10.31.0",
"carbon-components": "~10.32.0",
"carbon-web-components": "^1.0.0",
"lit-element": "~2.2.0",
"lit-html": "^1.2.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/codesandbox/form/redux-form/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"start": "webpack serve"
},
"dependencies": {
"carbon-components": "~10.31.0",
"carbon-components": "~10.32.0",
"carbon-web-components": "^1.0.0",
"lit-element": "~2.2.0",
"lit-html": "^1.2.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/codesandbox/ie/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"@webcomponents/url": "^0.7.0",
"@webcomponents/webcomponents-platform": "^1.0.0",
"babel-loader": "^8.0.0",
"carbon-components": "~10.31.0",
"carbon-components": "~10.32.0",
"carbon-web-components": "^1.0.0",
"core-js": "^3.0.0",
"es6-promise": "^4.1.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/codesandbox/next/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"license": "Apache-2",
"dependencies": {
"carbon-components": "~10.31.0",
"carbon-components": "~10.32.0",
"carbon-web-components": "^1.10.0",
"lit-element": "~2.4.0",
"lit-html": "~1.3.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/codesandbox/react-ssr/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"start": "echo 'Running server in Node 12.16.3+. If you have such Node version in your system just `node app.js` here will work.' && ./node_modules/node/node_modules/.bin/node app.js"
},
"dependencies": {
"carbon-components": "~10.31.0",
"carbon-components": "~10.32.0",
"carbon-web-components": "^1.10.0",
"express": "^4.17.0",
"lit-element": "~2.4.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/codesandbox/react/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"start": "webpack serve"
},
"dependencies": {
"carbon-components": "~10.31.0",
"carbon-components": "~10.32.0",
"carbon-web-components": "^1.0.0",
"lit-element": "~2.2.0",
"lit-html": "^1.2.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/codesandbox/rtl/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"@babel/preset-env": "^7.8.0",
"@babel/runtime": "^7.8.0",
"accept-language-parser": "^1.5.0",
"carbon-components": "~10.31.0",
"carbon-components": "~10.32.0",
"carbon-web-components": "^1.0.0",
"classnames": "^2.2.0",
"es6-promise": "^4.1.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/codesandbox/styling/custom-style/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"start": "webpack serve"
},
"dependencies": {
"carbon-components": "~10.31.0",
"carbon-components": "~10.32.0",
"carbon-web-components": "^1.0.0",
"lit-element": "~2.2.0",
"lit-html": "^1.2.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/codesandbox/styling/theme-zoning/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"start": "webpack serve"
},
"dependencies": {
"carbon-components": "~10.31.0",
"carbon-components": "~10.32.0",
"carbon-web-components": "^1.0.0",
"lit-element": "~2.2.0",
"lit-html": "^1.2.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/codesandbox/vue/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"build": "vue-cli-service build"
},
"dependencies": {
"carbon-components": "~10.31.0",
"carbon-components": "~10.32.0",
"carbon-web-components": "^1.0.0",
"lit-element": "~2.2.0",
"lit-html": "^1.2.0",
Expand Down
10 changes: 5 additions & 5 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,10 +110,10 @@
"@babel/template": "^7.10.0",
"@babel/traverse": "^7.11.0",
"@carbon/icon-helpers": "^10.15.0",
"@carbon/icons": "^10.28.0",
"@carbon/icons": "^10.29.0",
"@carbon/icons-angular": "^10.8.0",
"@carbon/icons-react": "^10.28.0",
"@carbon/icons-vue": "^10.28.0",
"@carbon/icons-react": "^10.29.0",
"@carbon/icons-vue": "^10.29.0",
"@commitlint/cli": "^7.5.0",
"@commitlint/config-conventional": "^7.5.0",
"@open-wc/semantic-dom-diff": "^0.15.0",
Expand Down Expand Up @@ -153,7 +153,7 @@
"babel-preset-vue": "^2.0.0",
"bluebird": "^3.5.0",
"cache-loader": "^4.1.0",
"carbon-components": "^10.31.0",
"carbon-components": "^10.32.0",
"child-process-promise": "^2.2.0",
"commander": "^2.13.0",
"core-js": "^3.0.0",
Expand Down Expand Up @@ -260,7 +260,7 @@
"zone.js": "^0.8.0"
},
"peerDependencies": {
"carbon-components": "~10.31.0",
"carbon-components": "~10.32.0",
"flatpickr": "4.6.1",
"lit-element": "^2.3.0",
"lit-html": "^1.2.0"
Expand Down
19 changes: 18 additions & 1 deletion src/components/content-switcher/content-switcher.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//
// Copyright IBM Corp. 2019, 2020
// Copyright IBM Corp. 2019, 2021
//
// This source code is licensed under the Apache-2.0 license found in the
// LICENSE file in the root directory of this source tree.
Expand Down Expand Up @@ -31,6 +31,8 @@ $css--plex: true !default;
&:first-child,
&:last-child {
border-radius: 0;
border-left: none;
border-right: none;
}

&::before {
Expand All @@ -51,6 +53,11 @@ $css--plex: true !default;
background-color: transparent;
}
}

&:disabled {
border-top-color: $ui-05;
border-bottom-color: $ui-05;
}
}
}

Expand All @@ -61,13 +68,23 @@ $css--plex: true !default;
:host(#{$prefix}-content-switcher-item:first-of-type) .#{$prefix}--content-switcher-btn {
border-top-left-radius: rem(4px);
border-bottom-left-radius: rem(4px);
border-left: rem(1px) solid $ui-05;

&::before {
content: none;
}

&.#{$prefix}--content-switcher--selected {
border-left: none;
}
}

:host(#{$prefix}-content-switcher-item:last-of-type) .#{$prefix}--content-switcher-btn {
border-top-right-radius: rem(4px);
border-bottom-right-radius: rem(4px);
border-right: rem(1px) solid $ui-05;

&.#{$prefix}--content-switcher--selected {
border-right: none;
}
}
4 changes: 2 additions & 2 deletions src/components/data-table/_table-expandable.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//
// Copyright IBM Corp. 2020
// Copyright IBM Corp. 2020, 2021
//
// This source code is licensed under the Apache-2.0 license found in the
// LICENSE file in the root directory of this source tree.
Expand All @@ -12,7 +12,7 @@
width: 2.5rem;
height: 3rem;
vertical-align: middle;
padding: 0 $spacing-05;
padding: 0;
border-bottom: 1px solid $ui-03;
transition: transform $duration--moderate-01 motion(standard, productive);
}
Expand Down
32 changes: 16 additions & 16 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3768,25 +3768,25 @@
dependencies:
"@carbon/icon-helpers" "10.5.1"

"@carbon/icons-react@^10.28.0":
version "10.28.0"
resolved "https://registry.yarnpkg.com/@carbon/icons-react/-/icons-react-10.28.0.tgz#c4a18cdf1a72d56df67b498d1dbe9a792f428d5d"
integrity sha512-y7BKGPCqF6xJx/VMU/KHJdXsGKk+cY9F9Mi18Si9oJlY14foV/Us9Nw2eJjgPNO6MRdcxb2H6lmakngGEznB1Q==
"@carbon/icons-react@^10.29.0":
version "10.29.0"
resolved "https://registry.yarnpkg.com/@carbon/icons-react/-/icons-react-10.29.0.tgz#dea9920921f087b2c0e969f2ae2d95cee70e7ae9"
integrity sha512-EIupNXYnz9nJQyJO0/ZW4c8vrVjrWzXrJCFkN+x6Y7wtjDrrmN/AgRlp/m8D+AmojsdDAtY9fXBLN/93XowmRw==
dependencies:
"@carbon/icon-helpers" "^10.15.0"
prop-types "^15.7.2"

"@carbon/icons-vue@^10.28.0":
version "10.28.0"
resolved "https://registry.yarnpkg.com/@carbon/icons-vue/-/icons-vue-10.28.0.tgz#1c97757fea8280fbfc921f4a3b68bf31b83f2a53"
integrity sha512-JQHultYyqvsGeoroHZ9/huRNMblXr+sctATVOz7zAX8p70fVifpIEmt3w87lzH4RPOpGy8vAu5qWYbeaFK5bqQ==
"@carbon/icons-vue@^10.29.0":
version "10.29.0"
resolved "https://registry.yarnpkg.com/@carbon/icons-vue/-/icons-vue-10.29.0.tgz#67f793303fac0e4396b358fc6bef6089a82b75e9"
integrity sha512-NvttZlKnL7zRYtWkorI6sMeI8TMahPAaxJ+WGLMM3q7P5K4PDvD23JmPcGMvyLkwY3AV0wi+8YzvnTk/6lZhsw==
dependencies:
"@carbon/icon-helpers" "^10.15.0"

"@carbon/icons@^10.28.0":
version "10.28.0"
resolved "https://registry.yarnpkg.com/@carbon/icons/-/icons-10.28.0.tgz#54d94972e5c0cf56aab9c424e8c436a4c7fe9818"
integrity sha512-UjdnLry5JRy9cJAGeu7dTlMPkBlV/KMqRBEBADX4Ak0CJVDcT3zpvo2x+tFlJnjsmnxW8TIO7rP1ZMtosbuIBA==
"@carbon/icons@^10.29.0":
version "10.29.0"
resolved "https://registry.yarnpkg.com/@carbon/icons/-/icons-10.29.0.tgz#98d33c721b7621614bbfdcf5862fb389f9dfc999"
integrity sha512-HMlQTUfCI50UDBUHKnk5DvTCypEQS3fzJQDi5anbzf7zcvljnkrdZy7jT42qAYAn6oV04TCWEH5CSshm4Nej9A==

"@carbon/telemetry@0.0.0-alpha.6":
version "0.0.0-alpha.6"
Expand Down Expand Up @@ -8349,10 +8349,10 @@ capture-exit@^2.0.0:
dependencies:
rsvp "^4.8.4"

carbon-components@^10.31.0:
version "10.31.0"
resolved "https://registry.yarnpkg.com/carbon-components/-/carbon-components-10.31.0.tgz#050751e7fb4d845b7d1c6e8ac7fdfa9c71403c12"
integrity sha512-gUXRky9rUHavqFLJJQf+Lzouk8GHsXJUjxRgTOUQ6vdBfA0ks6ugwptG8fiFGwCJJht/CW9/YsKb5w8N9a39sg==
carbon-components@^10.32.0:
version "10.32.0"
resolved "https://registry.yarnpkg.com/carbon-components/-/carbon-components-10.32.0.tgz#0fbf60ea8fc12cea43ae7860bec844b3c2c0880f"
integrity sha512-LM44X6VhUc+yrZBSz+IW1aT/OGxAS0oiiy/kV7CiDpsUDF5zlPOwgokZbeYLo2mhB1wBZ1q9jwvItZ4zfaZuMw==
dependencies:
"@carbon/telemetry" "0.0.0-alpha.6"
flatpickr "4.6.1"
Expand Down