Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(codesnippet): type specs codesnippet uses white theme instead of default g10 #1040

Merged
merged 2 commits into from
Nov 4, 2021
Merged

fix(codesnippet): type specs codesnippet uses white theme instead of default g10 #1040

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
81cb405
fix: add zone theming to codesnippet
jnm2377 Nov 3, 2021
805acdd
chore: update gtc and carbon deps
jnm2377 Nov 3, 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
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,15 +69,15 @@
"@loadable/component": "^5.15.0",
"@loadable/webpack-plugin": "^5.15.0",
"babel-preset-gatsby": "^1.7.1",
"carbon-components": "^10.37.0",
"carbon-components-react": "^7.37.1",
"carbon-components": "^10.47.0",
"carbon-components-react": "^7.47.1",
"copy-to-clipboard": "^3.2.1",
"fs-extra": "^8.1.0",
"gatsby": "^3.7.2",
"gatsby-plugin-manifest": "^3.7.1",
"gatsby-plugin-remove-serviceworker": "^1.0.0",
"gatsby-plugin-sitemap": "^4.3.1",
"gatsby-theme-carbon": "^2.1.3",
"gatsby-theme-carbon": "^2.1.5",
"lodash-es": "^4.17.15",
"prop-types": "^15.7.2",
"raw-loader": "^4.0.2",
Expand Down
7 changes: 7 additions & 0 deletions src/components/TypesetExample/_typeset-example.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,11 @@
.#{$prefix}--typeset-example-code-style {
display: block;
margin-top: $spacing-03;
// GTC is using gray10 theme for the main content pages. In g10 theme, codesnippet is white
// But that doesn't work for typespec component bc it's a white snippet on white bg
// this adds zoned theming to just the inline snippet so it uses white theme tokens (gray bg)
@include carbon--theme(
$theme: $carbon--theme--white,
$emit-custom-properties: true
);
}
57 changes: 52 additions & 5 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1075,6 +1075,13 @@
dependencies:
regenerator-runtime "^0.13.4"

"@babel/runtime@^7.14.6":
version "7.16.0"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.16.0.tgz#e27b977f2e2088ba24748bf99b5e1dece64e4f0b"
integrity sha512-Nht8L0O8YCktmsDV6FqFue7vQLRx3Hb0B37lS5y0jDRqRxlBG4wIJHnf9/bgSE2UyipKFA01YtS+npRdTWBUyw==
dependencies:
regenerator-runtime "^0.13.4"

"@babel/runtime@^7.7.7":
version "7.13.16"
resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.13.16.tgz#673e7b84c1f6287d96d483fa65cd3db792d53e22"
Expand Down Expand Up @@ -1181,12 +1188,12 @@
"@carbon/import-once" "^10.6.0"
"@carbon/layout" "^10.33.0"

"@carbon/icon-helpers@^10.24.0", "@carbon/icon-helpers@^10.25.0":
"@carbon/icon-helpers@^10.25.0":
version "10.25.0"
resolved "https://registry.yarnpkg.com/@carbon/icon-helpers/-/icon-helpers-10.25.0.tgz#bfe2465e165bb78477c77494610552064fcab09f"
integrity sha512-jvDUKz3NLopiDf7BROLDAT4NoswMpeXg4+ulbkLlFHdgY3v7gaxT/MJ7f9DZeEIiYUBhQSjTmcB3agIIO1jOdw==

"@carbon/icons-react@^10.26.0", "@carbon/icons-react@^10.35.0", "@carbon/icons-react@^10.40.0":
"@carbon/icons-react@^10.26.0", "@carbon/icons-react@^10.35.0", "@carbon/icons-react@^10.40.0", "@carbon/icons-react@^10.42.0":
version "10.42.0"
resolved "https://registry.yarnpkg.com/@carbon/icons-react/-/icons-react-10.42.0.tgz#2402a350514c0a1c33b575922b49b235a20a6330"
integrity sha512-eW2FE+OSo73A//L+F/NtfJ61co45TYnEU028YiGS7Tnlwr8pHO/62jUp39iVK2b6pbbRNXhNgYkmecZE+3rozg==
Expand All @@ -1212,6 +1219,11 @@
resolved "https://registry.npmjs.org/@carbon/layout/-/layout-10.33.0.tgz#15fa1db6f80f02f76c84aa1665c67751bb0ec472"
integrity sha512-3yHf/5tPVkvGUYC4ueUSoo5Tw1UxpKxAmigVZCf7MRe9dc06z68xyxrz+mZ5bIPBzbbfLYfz/y6FaD3Toeo30g==

"@carbon/layout@^10.34.0":
version "10.34.0"
resolved "https://registry.yarnpkg.com/@carbon/layout/-/layout-10.34.0.tgz#83dd68303f6ad29e6b4964b88da7bb2942e3e8d2"
integrity sha512-+PAQfV/bEXM9zRcjDWtuCjl/62mqdN6vpaal+6wnFi0FADr+uHYhNi+9W6QUpa29nbUqgIla+jlr59gAYidGLw==

"@carbon/motion@^10.25.0":
version "10.25.0"
resolved "https://registry.npmjs.org/@carbon/motion/-/motion-10.25.0.tgz#e4a83eb73be33eaa8bd1e4e42ace25e1554e5370"
Expand Down Expand Up @@ -3916,7 +3928,7 @@ caniuse-lite@^1.0.30001109:
resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001255.tgz#f3b09b59ab52e39e751a569523618f47c4298ca0"
integrity sha512-F+A3N9jTZL882f/fg/WWVnKSu6IOo3ueLz4zwaOPbPYHNmM/ZaDUyzyJwS1mZhX7Ex5jqTyW599Gdelh5PDYLQ==

carbon-components-react@^7.37.1, carbon-components-react@^7.39.0:
carbon-components-react@^7.39.0:
version "7.45.0"
resolved "https://registry.npmjs.org/carbon-components-react/-/carbon-components-react-7.45.0.tgz#e7f603ea5ec5bd7704d67a0fd43447e32f5877e0"
integrity sha512-1KoPSsOGEULhFzc5yjJECSwmawH5QRmY6BhQuKHfsLpnx2O8mQdfYXry3kOh8M9/+T91HWDA1YhHSUIo/1/IzA==
Expand All @@ -3939,7 +3951,32 @@ carbon-components-react@^7.37.1, carbon-components-react@^7.39.0:
wicg-inert "^3.1.1"
window-or-global "^1.0.1"

carbon-components@^10.37.0, carbon-components@^10.39.0:
carbon-components-react@^7.47.1:
version "7.47.1"
resolved "https://registry.yarnpkg.com/carbon-components-react/-/carbon-components-react-7.47.1.tgz#894c83612f90a606425db1b2e39a3f65032e4a26"
integrity sha512-wvgJoCpnuo7AJHdBydLLHKcG76zgXH0itB3ey9pH89FN4ei3RZO/i7qSsc6xCraPjZONhR24Jw6TNKtciL3gMg==
dependencies:
"@babel/runtime" "^7.14.6"
"@carbon/feature-flags" "^0.6.0"
"@carbon/icons-react" "^10.42.0"
"@carbon/layout" "^10.34.0"
"@carbon/telemetry" "0.0.0-alpha.6"
classnames "2.3.1"
copy-to-clipboard "^3.3.1"
downshift "5.2.1"
flatpickr "4.6.9"
invariant "^2.2.3"
lodash.debounce "^4.0.8"
lodash.findlast "^4.5.0"
lodash.isequal "^4.5.0"
lodash.omit "^4.5.0"
lodash.throttle "^4.1.1"
react-is "^16.8.6"
use-resize-observer "^6.0.0"
wicg-inert "^3.1.1"
window-or-global "^1.0.1"

carbon-components@^10.39.0:
version "10.45.0"
resolved "https://registry.npmjs.org/carbon-components/-/carbon-components-10.45.0.tgz#db5f0a53cda4e53dbd7aeaed9a99d86184484b66"
integrity sha512-+bpckp18pIp5kutda8gpGbkQ88O1FzhSSFSA1IQ4pPJnOjyBnNu+ebiBJOZt0ccOXZPDkyuSKxhQeCboyVCUwA==
Expand All @@ -3949,6 +3986,16 @@ carbon-components@^10.37.0, carbon-components@^10.39.0:
lodash.debounce "^4.0.8"
warning "^3.0.0"

carbon-components@^10.47.0:
version "10.47.0"
resolved "https://registry.yarnpkg.com/carbon-components/-/carbon-components-10.47.0.tgz#fbc984531e3abe9d072dc88b371bd5bb397c2b0d"
integrity sha512-ThjNOMUL6kFgMORvLII76WMGD4VEqgSA+wft5AK9imhsAIFP/54LxzAH+FSpZxP+VA0FjbunUUIv3pKOodedbA==
dependencies:
"@carbon/telemetry" "0.0.0-alpha.6"
flatpickr "4.6.1"
lodash.debounce "^4.0.8"
warning "^3.0.0"

carbon-icons@^7.0.7:
version "7.0.7"
resolved "https://registry.npmjs.org/carbon-icons/-/carbon-icons-7.0.7.tgz#ebafe3e9fa25df973796a8eca06d8a7c501cc610"
Expand Down Expand Up @@ -7182,7 +7229,7 @@ gatsby-telemetry@^2.14.0:
node-fetch "^2.6.1"
uuid "3.4.0"

gatsby-theme-carbon@^2.1.3:
gatsby-theme-carbon@^2.1.5:
version "2.1.5"
resolved "https://registry.yarnpkg.com/gatsby-theme-carbon/-/gatsby-theme-carbon-2.1.5.tgz#92a5855d3fbabf8a420f72eea4830e3350c06dbc"
integrity sha512-8KRHvmEcIJTE9r5pmVUbp7na5mjNA5z6KaqD0ndQDSId3mZxXDP2VW2a6Dg+OYaGX7nLuf0pr5CcYnblIgMPQg==
Expand Down