Skip to content

Commit

Permalink
Merge branch 'main' into create-pull-request/patch-1734304085
Browse files Browse the repository at this point in the history
  • Loading branch information
guidari authored Dec 17, 2024
2 parents b37421e + e32f7dc commit 71df718
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 34 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"d3": "^7.9.0",
"gatsby": "^5.13.5",
"gatsby-plugin-sharp": "^5.13.1",
"gatsby-theme-carbon": "^4.1.14",
"gatsby-theme-carbon": "^4.1.21",
"markdown-it": "^14.1.0",
"prettier-config-carbon": "^0.11.0",
"react": "^18.2.0",
Expand Down
10 changes: 5 additions & 5 deletions src/pages/components/dropdown/usage.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -826,11 +826,11 @@ boxes are useful when the data populating the list may come from a database.
</Column>
</Row>

- The menu opens by clicking anywhere in the field and you can start typing to
sort through the list of options. The option that best matches the typed
characters is highlighted.
- After typing text in the field, the close (x) icon appears to the right of the
text in the field. This clears any text that’s been entered in the field.
- The menu opens by clicking anywhere in the field, allowing users to type and
sort through the list of options. The best-matching option is highlighted as
users type.
- A close (x) icon clears the input, and autocomplete refines options as users
type.

<Row>
<Column colLg={8}>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/components/tooltip/code.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ documentation, see the Storybooks for each framework below.
<Column colLg={4} colMd={4} noGutterSm>
<ResourceCard
subTitle="React"
href="https://react.carbondesignsystem.com/?path=/story/components-tooltip--default-bottom"
href="https://react.carbondesignsystem.com/?path=/story/components-tooltip--default"
>

<MdxIcon name="react" />
Expand Down
2 changes: 1 addition & 1 deletion src/pages/data-visualization/color-palettes/index.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ be used to represent any meaningful progression or divergence. Never use a
gradient in place of a sequential palette.

For the full list of approved gradient options, see the IBM Design Language
[Color page](https://www.ibm.com/design/language/elements/color#gradients).
[Color page](https://www.ibm.com/design/language/color#gradients).

<Row>
<Column colLg={8} colMd={6} colSm={4}>
Expand Down
6 changes: 3 additions & 3 deletions src/pages/elements/typography/code.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,11 @@ You can find a full reference of the type styles that are available on the

You can include a token in your Sass file by writing:

````scss
```scss
@use '@carbon/type';

@include type.type-style('productive-heading-01');
``` |
```

### Reset

Expand All @@ -97,7 +97,7 @@ include this mixin by writing the following in your Sass file:
@use '@carbon/type';

@include type.reset();
````
```

This reset sets some top-level properties on `html` and `body`, namely
`font-size`, `font-family`, and some `text-rendering` options. We also map the
Expand Down
38 changes: 15 additions & 23 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3257,15 +3257,15 @@ __metadata:
languageName: node
linkType: hard

"@carbon/react@npm:^1.71.0":
version: 1.71.0
resolution: "@carbon/react@npm:1.71.0"
"@carbon/react@npm:^1.72.0":
version: 1.72.0
resolution: "@carbon/react@npm:1.72.0"
dependencies:
"@babel/runtime": "npm:^7.24.7"
"@carbon/feature-flags": "npm:^0.24.0"
"@carbon/icons-react": "npm:^11.53.0"
"@carbon/layout": "npm:^11.28.0"
"@carbon/styles": "npm:^1.70.0"
"@carbon/styles": "npm:^1.71.0"
"@floating-ui/react": "npm:^0.26.0"
"@ibm/telemetry-js": "npm:^1.5.0"
classnames: "npm:2.5.1"
Expand All @@ -3274,7 +3274,6 @@ __metadata:
flatpickr: "npm:4.6.13"
invariant: "npm:^2.2.3"
lodash.debounce: "npm:^4.0.8"
lodash.findlast: "npm:^4.5.0"
lodash.omit: "npm:^4.5.0"
lodash.throttle: "npm:^4.1.1"
prop-types: "npm:^15.7.2"
Expand All @@ -3287,13 +3286,13 @@ __metadata:
react: ^16.8.6 || ^17.0.1 || ^18.2.0
react-dom: ^16.8.6 || ^17.0.1 || ^18.2.0
sass: ^1.33.0
checksum: 397e80b40b396dcb5e5b161c5c520555bdcf3808482a9a9ca0f2ac819f69b29f5f70157cceca2f032f637d93d02c0ef1ee17e9e504be2801e73ef7bb315e0ffc
checksum: f08b7261ff792e95c6226f8c72280d8111996ba710a9e88bdb2bfe9828ebb9410fc427492b89a2f5b07afc42f9e66ed1f6fa3f666af87005a278572cdbadc499
languageName: node
linkType: hard

"@carbon/styles@npm:^1.70.0":
version: 1.70.0
resolution: "@carbon/styles@npm:1.70.0"
"@carbon/styles@npm:^1.71.0":
version: 1.71.0
resolution: "@carbon/styles@npm:1.71.0"
dependencies:
"@carbon/colors": "npm:^11.28.0"
"@carbon/feature-flags": "npm:^0.24.0"
Expand All @@ -3317,7 +3316,7 @@ __metadata:
peerDependenciesMeta:
sass:
optional: true
checksum: 020d94f3c34d95695b05e26556648ee5e155fe796c862048e6c8db3d5529dab4a079d050c03962ab20243161b542bc42389ffebd23f6ca0e11baf0308c867974
checksum: a057da72de5cfb49b23973d928ef33f412cfe64c4ede341a281349e5ab42232b7cc5e78a13e85d3615bddd7c548afd29bd15a635e9361fbe4497390f23f870a6
languageName: node
linkType: hard

Expand Down Expand Up @@ -7409,7 +7408,7 @@ __metadata:
gatsby-plugin-sharp: "npm:^5.13.1"
gatsby-plugin-sitemap: "npm:^6.13.1"
gatsby-source-filesystem: "npm:^5.13.1"
gatsby-theme-carbon: "npm:^4.1.14"
gatsby-theme-carbon: "npm:^4.1.21"
gatsby-transformer-sharp: "npm:^5.13.1"
html-loader: "npm:^5.1.0"
husky: "npm:^9.0.11"
Expand Down Expand Up @@ -12224,17 +12223,17 @@ __metadata:
languageName: node
linkType: hard

"gatsby-theme-carbon@npm:^4.1.14":
version: 4.1.14
resolution: "gatsby-theme-carbon@npm:4.1.14"
"gatsby-theme-carbon@npm:^4.1.21":
version: 4.1.21
resolution: "gatsby-theme-carbon@npm:4.1.21"
dependencies:
"@babel/core": "npm:^7.24.7"
"@babel/plugin-proposal-class-properties": "npm:^7.18.6"
"@babel/plugin-syntax-jsx": "npm:^7.24.7"
"@carbon/elements": "npm:^11.57.0"
"@carbon/grid": "npm:^11.29.0"
"@carbon/pictograms-react": "npm:^11.69.0"
"@carbon/react": "npm:^1.71.0"
"@carbon/react": "npm:^1.72.0"
"@carbon/themes": "npm:^11.43.0"
"@garcia-enterprise/gatsby-plugin-sass-resources": "npm:^4.0.2"
"@mdx-js/mdx": "npm:^3.0.1"
Expand Down Expand Up @@ -12280,7 +12279,7 @@ __metadata:
gatsby: ^5.13.3
react: ^18.2.0
react-dom: ^18.2.0
checksum: ce25fbb209032267cf70c7d8d07ee87979bfde1b92fee14c99b66208274f3d553a69d0544ce406ef2b6a27331b11c03a52640317e36d62876fbda5823b168d8e
checksum: a6c5c679db8efebc63558f9e6efcfacf912230e7935f8b0dc3de6e400a3245bbe80b6831709f2cd01e4e13e1fe9697499cc724bf7ee3f4c0801eb6fcee628240
languageName: node
linkType: hard

Expand Down Expand Up @@ -15127,13 +15126,6 @@ __metadata:
languageName: node
linkType: hard

"lodash.findlast@npm:^4.5.0":
version: 4.6.0
resolution: "lodash.findlast@npm:4.6.0"
checksum: 1b3f084694c19348d78eaf05399ad5f464024af864bfb6514654cfd22e3a6709402505ca04645a99461faadfedf7e2b347c52b18989621b0aeec631aaf00ce74
languageName: node
linkType: hard

"lodash.flattendeep@npm:^4.4.0":
version: 4.4.0
resolution: "lodash.flattendeep@npm:4.4.0"
Expand Down

0 comments on commit 71df718

Please sign in to comment.