Skip to content

Commit

Permalink
Update content links to use v10 branch (#2791)
Browse files Browse the repository at this point in the history
* fix(modal): remove width column from max sizes table

* chore(team): add taylor photo

* chore(links): update github links to point to v10 branch

* chore(links): update github links to point to v10 branch

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
  • Loading branch information
tay1orjones and kodiakhq[bot] authored Mar 28, 2022
1 parent faf9c06 commit 6bc6ae1
Show file tree
Hide file tree
Showing 28 changed files with 92 additions and 84 deletions.
6 changes: 4 additions & 2 deletions src/components/SVGLibraries/IconLibrary/IconLibrary.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@ const IconLibrary = () => {

useEffect(() => {
const iconArray = iconMetaData.reduce((accumulator, icon) => {
if (icon.deprecated) {return accumulator;}
if (icon.deprecated) {
return accumulator;
}

const path = [...icon.namespace, icon.name].join('/');

Expand Down Expand Up @@ -118,7 +120,7 @@ const IconLibrary = () => {
setSelectedCategory={setSelectedCategory}
allIconResults={filteredIcons.length}
pageName="icon"
pageUrl="https://github.com/carbon-design-system/carbon/blob/main/packages/icons/master/ui-icon-master.ai"
pageUrl="https://github.com/carbon-design-system/carbon/blob/v10/packages/icons/master/ui-icon-master.ai"
/>
) : (
<div className={svgLibrary}>
Expand Down
12 changes: 6 additions & 6 deletions src/components/SVGLibraries/PictogramLibrary/PictogramLibrary.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,8 @@ import { svgPage, svgLibrary } from '../shared/SvgLibrary.module.scss';
import PictogramCategory from './PictogramCategory';
import NoResult from '../shared/NoResult';

const {
icons: pictogramMetaData,
categories: pictogramCategoryMetadata,
} = metaData;
const { icons: pictogramMetaData, categories: pictogramCategoryMetadata } =
metaData;

const IconLibrary = () => {
const [pictogramComponents, setPictogramComponents] = useState([]);
Expand All @@ -31,7 +29,9 @@ const IconLibrary = () => {
useEffect(() => {
const pictogramArray = pictogramMetaData.reduce(
(accumulator, pictogram) => {
if (pictogram.deprecated) {return accumulator;}
if (pictogram.deprecated) {
return accumulator;
}

const path = [...pictogram.namespace, pictogram.name].join('/');

Expand Down Expand Up @@ -109,7 +109,7 @@ const IconLibrary = () => {
setSelectedCategory={setSelectedCategory}
allIconResults={filteredPictograms.length}
pageName="pictogram"
pageUrl="https://github.com/carbon-design-system/carbon/raw/main/packages/pictograms/master/productive-pictogram-master.ai"
pageUrl="https://github.com/carbon-design-system/carbon/raw/v10/packages/pictograms/master/productive-pictogram-master.ai"
/>
) : (
<div className={svgLibrary}>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/contributing/component/index.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -691,7 +691,7 @@ specific repo you intend to contribute to.
<Column colMd={4} colLg={4} noGutterSm>
<ResourceCard
subTitle="Contribute to Carbon Components React"
href="https://github.com/carbon-design-system/carbon/blob/main/.github/CONTRIBUTING.md"
href="https://github.com/carbon-design-system/carbon/blob/v10/.github/CONTRIBUTING.md"
>

<MdxIcon name="github" />
Expand Down
4 changes: 2 additions & 2 deletions src/pages/contributing/contribute-icons.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ guidelines to ensure visual consistency and proper formatting.
- Make sure to properly name layers and artboards _(these names will also be
exported into the code)_.
- Review the
[icon master file](https://github.com/carbon-design-system/carbon/tree/main/packages/icons/master)
[icon master file](https://github.com/carbon-design-system/carbon/tree/v10/packages/icons/master)
to see these guidelines in practice.

### Production-ready
Expand Down Expand Up @@ -124,7 +124,7 @@ for approval.
Before submitting artwork, first review our
[icons library](https://www.carbondesignsystem.com/guidelines/icons/library/) or
download the
[Carbon icon master .ai file](https://github.com/carbon-design-system/carbon/tree/main/packages/icons/master)
[Carbon icon master .ai file](https://github.com/carbon-design-system/carbon/tree/v10/packages/icons/master)
to check your design for duplication against existing icons.

### Approval process
Expand Down
11 changes: 7 additions & 4 deletions src/pages/designing/design-resources/index.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ You'll find even more guidance and assets in this file than on the site.
<Column colLg={4} colMd={4} noGutterSm>
<ResourceCard
subTitle="RGB color palettes (.ase and .clr)"
href="https://github.com/carbon-design-system/carbon/raw/main/packages/colors/artifacts/IBM_Colors.zip"
href="https://github.com/carbon-design-system/carbon/raw/v10/packages/colors/artifacts/IBM_Colors.zip"
actionIcon="download">

![](/images/ase.png)
Expand Down Expand Up @@ -125,7 +125,8 @@ You'll find even more guidance and assets in this file than on the site.
<ResourceCard
subTitle="UI Shell template"
href="https://www.sketch.com/s/6a8e1d7b-f00a-4d8d-9d83-79ecf4dc12a0"
actionIcon="launch">
actionIcon="launch"
>
<MdxIcon name="sketch" />
</ResourceCard>
</Column>
Expand All @@ -134,7 +135,8 @@ You'll find even more guidance and assets in this file than on the site.
<ResourceCard
subTitle="Text toolbar pattern library"
href="sketch://add-library/cloud/f32b7e90-d97e-48ef-ae53-beabf75f5846"
actionIcon="download">
actionIcon="download"
>
<MdxIcon name="sketch" />
</ResourceCard>
</Column>
Expand Down Expand Up @@ -291,7 +293,8 @@ before committing to high-fidelity designs.
<ResourceCard
subTitle="Carbon Mid-Fi Sketch kit"
href="sketch://add-library/cloud/e888aa99-4d88-46a4-9b33-3a033e7f5ca2"
actionIcon="download">
actionIcon="download"
>
<MdxIcon name="sketch" />
</ResourceCard>
</Column>
Expand Down
5 changes: 3 additions & 2 deletions src/pages/developing/dev-resources/index.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ your framework of choice.
<Column colLg={4} colMd={4} noGutterSm>
<ResourceCard
subTitle="Carbon React"
href="https://github.com/carbon-design-system/carbon/tree/main/packages/react"
href="https://github.com/carbon-design-system/carbon/tree/v10/packages/react"
>

<MdxIcon name="github" />
Expand Down Expand Up @@ -75,7 +75,8 @@ your framework of choice.
<Column colMd={4} colLg={4} noGutterSm>
<ResourceCard
subTitle="Carbon Svelte"
href="https://github.com/IBM/carbon-components-svelte">
href="https://github.com/IBM/carbon-components-svelte"
>
<MdxIcon name="github" />
</ResourceCard>
</Column>
Expand Down
8 changes: 4 additions & 4 deletions src/pages/developing/frameworks/react.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ yarn add carbon-components-react carbon-components carbon-icons
1. These components require the use of
[webpack](https://webpack.js.org/guides/getting-started/) in your project.
See our
[webpack.config.js](https://github.com/carbon-design-system/carbon/blob/main/packages/react/.storybook/webpack.config.js)
[webpack.config.js](https://github.com/carbon-design-system/carbon/blob/v10/packages/react/.storybook/webpack.config.js)
for an example configuration.

2. Components do not import any of the styles themselves, use the SCSS or CSS
Expand All @@ -86,13 +86,13 @@ yarn add carbon-components-react carbon-components carbon-icons
CSS file.

3. For older browsers (e.g. IE11), polyfills listed in the
[carbon-components-react/.storybook/polyfills.js file](https://github.com/carbon-design-system/carbon/blob/main/packages/react/.storybook/polyfills.js)
[carbon-components-react/.storybook/polyfills.js file](https://github.com/carbon-design-system/carbon/blob/v10/packages/react/.storybook/polyfills.js)
are required.

## Development

Please refer to the
[Contribution Guidelines](https://github.com/carbon-design-system/carbon/blob/main/.github/CONTRIBUTING.md)
[Contribution Guidelines](https://github.com/carbon-design-system/carbon/blob/v10/.github/CONTRIBUTING.md)
before starting any work.

### Using the server
Expand Down Expand Up @@ -124,7 +124,7 @@ top right corner of the selected component.

If you experience any issues while getting set up with Carbon Components React,
please head over to the
[GitHub repo](https://github.com/carbon-design-system/carbon/tree/main/packages/react)
[GitHub repo](https://github.com/carbon-design-system/carbon/tree/v10/packages/react)
for more guidelines and support. Please
[create an issue](https://github.com/carbon-design-system/carbon/issues) if your
issue does not already exist.
6 changes: 3 additions & 3 deletions src/pages/developing/frameworks/vanilla.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ prefixes are automatically added to your output CSS.
#### Default body styles

CSS is automatically applied to `<body>` element, which comes from
[\_css--body.scss](https://github.com/carbon-design-system/carbon/blob/main/packages/components/src/globals/scss/_css--body.scss).
[\_css--body.scss](https://github.com/carbon-design-system/carbon/blob/v10/packages/components/src/globals/scss/_css--body.scss).
These styles are meant to cascade down to everything in `<body>` to set common
styles shared across all components.

Expand Down Expand Up @@ -153,7 +153,7 @@ to `true` by default.
For example:

- When you set `$css--reset: true`, then the contents of
[\_css--reset.scss](https://github.com/carbon-design-system/carbon/blob/main/packages/components/src/globals/scss/_css--reset.scss)
[\_css--reset.scss](https://github.com/carbon-design-system/carbon/blob/v10/packages/components/src/globals/scss/_css--reset.scss)
will be part of your output CSS.
- When you set `$css--reset: false`, then nothing gets included from that SCSS
file.
Expand Down Expand Up @@ -336,7 +336,7 @@ customElements.define('bx-loading', BXLoading);
carbon-components requires some polyfills for older browsers, in addition to
carbon-components.js (or carbon-components.min.js). The latest list of polyfills
is maintained in
[carbon-components/blob/main/packages/components/demo/polyfills/index.js](https://github.com/carbon-design-system/carbon/blob/main/packages/components/demo/polyfills/index.js).
[carbon-components/blob/main/packages/components/demo/polyfills/index.js](https://github.com/carbon-design-system/carbon/blob/v10/packages/components/demo/polyfills/index.js).
You can easily find the polyfills in NPM, etc. The current list is below:

- [Array.from()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/from)
Expand Down
6 changes: 4 additions & 2 deletions src/pages/developing/react-tutorial/step-1.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ git remote add upstream [email protected]:carbon-design-system/carbon-tutorial.git
```

#### HTTPS

```bash
git remote add upstream https://github.com/carbon-design-system/carbon-tutorial.git
```
Expand Down Expand Up @@ -302,7 +303,8 @@ const TutorialHeader = () => (
<SideNav
aria-label="Side navigation"
expanded={isSideNavExpanded}
isPersistent={false}>
isPersistent={false}
>
<SideNavItems>
<HeaderSideNavItems>
<HeaderMenuItem href="/repos">Repositories</HeaderMenuItem>
Expand All @@ -322,7 +324,7 @@ export default TutorialHeader;
**Note:** you can find a description of the different components used UI Shell
in our
[carbon-components-react](https://github.com/carbon-design-system/carbon/tree/main/packages/react/src/components/UIShell)
[carbon-components-react](https://github.com/carbon-design-system/carbon/tree/v10/packages/react/src/components/UIShell)
package.
</InlineNotification>
Expand Down
6 changes: 3 additions & 3 deletions src/pages/developing/react-tutorial/step-2.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ You should see something similar to where the

Before we get started with this step, we'll be adding some components that
require IE11 polyfills. As shown in the
[Carbon React documentation](https://github.com/carbon-design-system/carbon/blob/main/packages/react/.storybook/polyfills.js),
[Carbon React documentation](https://github.com/carbon-design-system/carbon/blob/v10/packages/react/.storybook/polyfills.js),
go ahead and add these imports to the top of the root `index.js`. They aren't
all needed, but we'll add them all to play it safe for the duration of the
tutorial.
Expand Down Expand Up @@ -260,8 +260,8 @@ import {

Before we can render the tabs, we need to add some props for the component after
the import. These example props came from the
[React Tabs Story](https://react.carbondesignsystem.com/?path=/story/components-tabs--default) in
Storybook.
[React Tabs Story](https://react.carbondesignsystem.com/?path=/story/components-tabs--default)
in Storybook.

```javascript path=src/content/LandingPage/LandingPage.js
const props = {
Expand Down
2 changes: 1 addition & 1 deletion src/pages/guidelines/2x-grid/implementation.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -1369,7 +1369,7 @@ Image size can change ratios when the breakpoint changes.
<Column colMd={4} colLg={4} noGutterSm>
<ResourceCard
subTitle="Carbon grid package"
href="https://github.com/carbon-design-system/carbon/blob/main/packages/grid"
href="https://github.com/carbon-design-system/carbon/blob/v10/packages/grid"
>

<MdxIcon name="bee" />
Expand Down
18 changes: 9 additions & 9 deletions src/pages/guidelines/2x-grid/overview.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ creative decision-making.
<Column colLg={4} colMd={4} noGutterSm>
<ResourceCard
subTitle="Elements package: Grid"
href="https://github.com/carbon-design-system/carbon/tree/main/packages/grid"
href="https://github.com/carbon-design-system/carbon/tree/v10/packages/grid"
>

<MdxIcon name="github" />
Expand Down Expand Up @@ -108,16 +108,16 @@ fluid grid, or by tiling fixed boxes in multiples.

#### Fluid grid

A fluid grid divides space by twos. This division is immediately
evident in the 2x column structure. Within a breakpoint, the column count is
constant, and unit size scales with screen size. Choose a column count by
starting with one, then divide by two as needed.
A fluid grid divides space by twos. This division is immediately evident in the
2x column structure. Within a breakpoint, the column count is constant, and unit
size scales with screen size. Choose a column count by starting with one, then
divide by two as needed.

#### Fixed grid

A fixed grid starts with a fixed unit size from the sizing scale,
then tiles and wraps as needed, like text. To employ the 2x concept, multiply
box sizes by two and mix them together.
A fixed grid starts with a fixed unit size from the sizing scale, then tiles and
wraps as needed, like text. To employ the 2x concept, multiply box sizes by two
and mix them together.

When tiling fixed boxes, the column count is not known in advance, but a grid
emerges visually due to the use of a consistent sizing scale. On breakpoint
Expand Down Expand Up @@ -181,7 +181,7 @@ breakpoints.

Create custom breakpoints to accommodate special needs, by writing your own
media queries and CSS rules. Refer to the
[grid code package](https://github.com/carbon-design-system/carbon/tree/main/packages/grid)
[grid code package](https://github.com/carbon-design-system/carbon/tree/v10/packages/grid)
for more information.

| Breakpoint | Value (px/rem) | Columns | Size (%) | Size | Padding | Margin |
Expand Down
2 changes: 1 addition & 1 deletion src/pages/guidelines/color/code.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ warmGray100; // Using the `warmGray100` variable.
<Column colMd={4} colLg={4} noGutterSm>
<ResourceCard
subTitle="Carbon color package"
href="https://github.com/carbon-design-system/carbon/blob/main/packages/colors"
href="https://github.com/carbon-design-system/carbon/blob/v10/packages/colors"
>

<MdxIcon name="github" />
Expand Down
4 changes: 2 additions & 2 deletions src/pages/guidelines/color/overview.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ For a complete look at color-related accessibility topics in Carbon, visit the
<Column colLg={4} colMd={4} noGutterSm>
<ResourceCard
subTitle="RGB color palettes (.ase and .clr)"
href="https://github.com/carbon-design-system/carbon/raw/main/packages/colors/artifacts/IBM_Colors.zip"
href="https://github.com/carbon-design-system/carbon/raw/v10/packages/colors/artifacts/IBM_Colors.zip"
>

<MdxIcon name="ase" />
Expand All @@ -362,7 +362,7 @@ For a complete look at color-related accessibility topics in Carbon, visit the
<Column colLg={4} colMd={4} noGutterSm>
<ResourceCard
subTitle="Elements package: Color"
href="https://github.com/carbon-design-system/carbon/tree/main/packages/colors"
href="https://github.com/carbon-design-system/carbon/tree/v10/packages/colors"
>

<MdxIcon name="github" />
Expand Down
4 changes: 2 additions & 2 deletions src/pages/guidelines/icons/code.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ browsers like Internet Explorer 11 by setting `focusable` to `true`.
<Column colMd={4} colLg={4} noGutterSm>
<ResourceCard
subTitle="Carbon icons package"
href="https://github.com/carbon-design-system/carbon/blob/main/packages/icons"
href="https://github.com/carbon-design-system/carbon/blob/v10/packages/icons"
>

<MdxIcon name="bee" />
Expand All @@ -173,7 +173,7 @@ browsers like Internet Explorer 11 by setting `focusable` to `true`.
<Column colMd={4} colLg={4} noGutterSm>
<ResourceCard
subTitle="Icon package demo"
href="https://github.com/carbon-design-system/carbon/blob/main/packages/icons"
href="https://github.com/carbon-design-system/carbon/blob/v10/packages/icons"
>

<MdxIcon name="bee" />
Expand Down
4 changes: 2 additions & 2 deletions src/pages/guidelines/icons/contribute.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ guidelines to ensure visual consistency and proper formatting.
- Make sure to properly name layers and artboards _(these names will also be
exported into the code)_.
- Review the
[icon master file](https://github.com/carbon-design-system/carbon/tree/main/packages/icons/master)
[icon master file](https://github.com/carbon-design-system/carbon/tree/v10/packages/icons/master)
to see these guidelines in practice.

### Production-ready
Expand Down Expand Up @@ -100,7 +100,7 @@ for approval.
Before submitting artwork, first review our
[icons library](https://www.carbondesignsystem.com/guidelines/icons/library/) or
download the
[Carbon icon master .ai file](https://github.com/carbon-design-system/carbon/tree/main/packages/icons/master)
[Carbon icon master .ai file](https://github.com/carbon-design-system/carbon/tree/v10/packages/icons/master)
to check your design for duplication against existing icons.

### Approval process
Expand Down
4 changes: 2 additions & 2 deletions src/pages/guidelines/icons/usage.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ important information.
<Column colLg={4} colMd={4} noGutterSm>
<ResourceCard
subTitle="Elements package: Icons"
href="https://github.com/carbon-design-system/carbon/tree/main/packages/icons"
href="https://github.com/carbon-design-system/carbon/tree/v10/packages/icons"
>

<MdxIcon name="github" />
Expand All @@ -35,7 +35,7 @@ important information.
<Column colLg={4} colMd={4} noGutterSm>
<ResourceCard
subTitle="Elements package: Icons-React"
href="https://github.com/carbon-design-system/carbon/tree/main/packages/icons-react"
href="https://github.com/carbon-design-system/carbon/tree/v10/packages/icons-react"
>

<MdxIcon name="github" />
Expand Down
4 changes: 2 additions & 2 deletions src/pages/guidelines/motion/overview.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ that it would come to rest just outside the view, and ready to be recalled.
### Summary on easing

The
[IBM motion package](https://github.com/carbon-design-system/carbon/tree/main/packages/motion)
[IBM motion package](https://github.com/carbon-design-system/carbon/tree/v10/packages/motion)
has the easing curves stored for fast access. This is the recommended method to
call an easing curve and stay connected to receive any future updates.

Expand Down Expand Up @@ -363,7 +363,7 @@ statically.
<Column colMd={4} colLg={4} noGutterSm>
<ResourceCard
subTitle="Elements package: Motion"
href="https://github.com/carbon-design-system/carbon/tree/main/packages/motion"
href="https://github.com/carbon-design-system/carbon/tree/v10/packages/motion"
>

<MdxIcon name="github" />
Expand Down
Loading

1 comment on commit 6bc6ae1

@vercel
Copy link

@vercel vercel bot commented on 6bc6ae1 Mar 28, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.