Skip to content

Commit

Permalink
Merge branch 'main' into next-tutorial
Browse files Browse the repository at this point in the history
  • Loading branch information
andreancardona authored Oct 9, 2023
2 parents c41a772 + 175ba94 commit 0fa9962
Show file tree
Hide file tree
Showing 46 changed files with 698 additions and 2,202 deletions.
29 changes: 8 additions & 21 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,32 +1,19 @@
# Default to system one design and one dev
* @carbon-design-system/developers-system @carbon-design-system/design

*.conf @vpicone

# Vikki Paterson is code owner for Experimental IDE patterns
src/pages/community/patterns/create-flows/* @vikkipaterson
src/pages/community/patterns/delete-pattern/* @vikkipaterson
src/pages/community/patterns/export-pattern/* @vikkipaterson
src/pages/community/patterns/generate-an-api-key/* @vikkipaterson
src/pages/community/patterns/import-pattern/* @vikkipaterson
src/pages/community/patterns/remove-pattern/* @vikkipaterson

# Vincent Snagg is code owner for Experimental Watson Health patterns
src/pages/community/patterns/chatbot/* @vincentsnagg
* @carbon-design-system/developers-system @carbon-design-system/design

# Adriana Morales is code owner for Experimental Cloud PAL patterns
src/pages/community/patterns/order-summary-template/* @adrianamorales
src/pages/community/patterns/cards/* @adrianamorales
src/pages/community/patterns/dashboard-widgets/* @adrianamorales
# Diana Tran is the owner for Sustainability Software Patterns

# Chris Reckling is the code owner for Experimental IoT patterns
src/pages/community/patterns/login-pattern/* @lukefirth
src/pages/community/patterns/login-pattern/* @dianatran18 @lukefirth

# Eliad Moosavi and Natasha Decoste are the code owners for Data Visualization

src/pages/data-visualization/* @theiliad @natashadecoste

# Cal Smith for Angular tutorial
# Zvonimir Fras for Angular tutorial

/src/pages/tutorial/angular/* @zvonimirfras

# Lee Chase for Vue tutorial
/src/pages/tutorial/vue/* @lee-chase

/src/pages/tutorial/vue/* @lee-chase
29 changes: 0 additions & 29 deletions .github/workflows/platform-content-sync.yml

This file was deleted.

1 change: 1 addition & 0 deletions conf.d/rewrite.conf
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ rewrite /get-started/design/(.*) /designing/get-started/kits/\$1 permanent;

# Contributions rewrites
rewrite /how-to-contribute/(.*) /contributing/\$1 permanent;
rewrite /contributing/overview /contributing/get-started permanent;

# What's happening
rewrite /updates/whats-new /whats-happening/releases permanent;
Expand Down
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@
"dependencies": {
"@babel/core": "^7.15.8",
"@carbon/charts-react": "0.55.0",
"@carbon/elements": "^11.29.0",
"@carbon/icons": "^11.26.0",
"@carbon/icons-react": "^11.26.0",
"@carbon/pictograms": "^12.22.0",
"@carbon/pictograms-react": "^11.48.0",
"@carbon/react": "^1.37.0",
"@carbon/elements": "^11.31.0",
"@carbon/icons": "^11.28.0",
"@carbon/icons-react": "^11.28.0",
"@carbon/pictograms": "^12.23.0",
"@carbon/pictograms-react": "^11.49.0",
"@carbon/react": "^1.39.0",
"@loadable/component": "^5.15.2",
"@slack/web-api": "^5.11.0",
"babel-preset-env": "^1.7.0",
Expand All @@ -58,7 +58,7 @@
"gatsby": "^4.25.7",
"gatsby-image": "^3.7.1",
"gatsby-plugin-image": "^2.9.0",
"gatsby-theme-carbon": "^3.1.12",
"gatsby-theme-carbon": "^3.1.20",
"lodash-es": "^4.17.15",
"markdown-it": "^12.3.2",
"nanoid": "^2.1.11",
Expand Down
20 changes: 6 additions & 14 deletions src/data/nav-items.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,22 +49,14 @@
path: /developing/vue-tutorial/overview/
- title: Contributing
pages:
- title: Overview
path: /contributing/overview/
- title: Bugs and requests
path: /contributing/bugs-and-requests/
- title: Get started
path: /contributing/get-started/
- title: Code
path: /contributing/code/
- title: Design
path: /contributing/design/
- title: Documentation
path: /contributing/documentation/
- title: Components
path: /contributing/component/
- title: Icons
path: /contributing/contribute-icons/
- title: Patterns
path: /contributing/pattern/
- title: Pictograms
path: /contributing/contribute-pictograms/
- title: Add ons
path: /contributing/add-ons/
- title: Migrating
pages:
- title: Guide
Expand Down
4 changes: 2 additions & 2 deletions src/pages/components/button/usage.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ Button groups are a useful way of aligning buttons that have a relationship.
Group the buttons logically into sets based on usage and importance. Too many
calls to action will overwhelm and confuse users so they should be avoided.

As mentioned in the [Emphasis section](#Emphasis), you don’t necessarily need to
As mentioned in the [Emphasis section](#emphasis), you don’t necessarily need to
use the buttons in the order that their labels imply. Either a secondary or a
tertiary button can be used in conjunction with a primary button. In fact, due
to the visual weight of the secondary button, it’s recommended to use tertiary
Expand Down Expand Up @@ -458,7 +458,7 @@ container with a programmatic 16px gutter between them.
#### Horizontally arranged groups

When using multiple buttons, the position of the primary button adheres to the
[alignment guidance](#Alignment) above. To sum up, a primary button will be
[alignment guidance](#alignment) above. To sum up, a primary button will be
left-aligned and positioned to the left of the secondary/tertiary button on
full-page designs. The primary button will be right-aligned and appear to the
right of the secondary/tertiary button within wizards and dialog windows.
Expand Down
Binary file modified src/pages/components/form/images/form-usage-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/pages/components/form/images/form-usage-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/pages/components/form/images/form-usage-3-do.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/pages/components/form/images/form-usage-3-dont.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/pages/components/form/images/form-usage-5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/pages/components/form/images/form-usage-optional.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/pages/components/form/images/form-usage-required.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 3 additions & 4 deletions src/pages/components/tooltip/usage.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ interactive elements, such as a button, that a user needs to interact with.
},
]}
/>

## Formatting

### Standard tooltip anatomy
Expand Down Expand Up @@ -336,10 +337,8 @@ or link.
### Best practices

- The content within a standard tooltip should be purely additional information
that is not critical for a user to read to complete a task.
- Standard tooltips appear on hover and are not focusable or read by screen
readers. If the content is essential for the user to interpret concerning
their workflow, use a
that is not critical for a user to read to complete a task. If the content is
essential for the user to interpret concerning their workflow, use a
[toggletip](https://carbondesignsystem.com/components/toggletip/usage/) for
this information instead.

Expand Down
49 changes: 0 additions & 49 deletions src/pages/contributing/add-ons.mdx

This file was deleted.

68 changes: 0 additions & 68 deletions src/pages/contributing/bugs-and-requests.mdx

This file was deleted.

Loading

0 comments on commit 0fa9962

Please sign in to comment.