Skip to content

Commit 3a731b8

Browse files
authored
Merge pull request #474 from puppetlabs/jtmuz-patch-1
2 parents 3a4510d + 141cf78 commit 3a731b8

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

packages/design-system-website/foundations/Contributing.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ Once handed a design comp it is generally the engineers responsibility to levera
2222
2. If a pre-baked component is not available, attempt to leverage the design system patterns encoded in our [sass-variable](https://github.com/puppetlabs/design-system/tree/master/packages/sass-variables) package. These Sass variables and mixins encode our lowest-level foundational elements including typography, color palettes, and common patterns such as borders and focus outlines.
2323
3. If you still can't find an existing asset, alert your designer: it may be a mistake, or they may not have done due-diligence in attempting to use existing patterns.
2424

25-
For instructions on getting your app set up to consume design system assets please refer to the [README.md](https://github.com/puppetlabs/design-system/blob/development/README.md).
25+
For instructions on getting your app set up to consume design system assets please refer to the [README.md](https://github.com/puppetlabs/design-system/blob/main/README.md).
2626

27-
For contributing, see [CONTRIBUTING.md](https://github.com/puppetlabs/design-system/blob/development/CONTRIBUTING.md).
27+
For contributing, see [CONTRIBUTING.md](https://github.com/puppetlabs/design-system/blob/main/CONTRIBUTING.md).
2828

2929
## Extending the System
3030

@@ -65,7 +65,7 @@ Once a pattern has been hardened and validated, it may be a good candidate for a
6565
New design and code patterns should be submitted in tandem to maintain parity. As implementation and adoption of these designs will impact multiple teams, a high degree of scrutiny will be applied to the design and code to assure that it meets our criteria.
6666

6767
- [Design contribution criteria](#/Foundations/Design)
68-
- [Engineering contribution criteria](https://github.com/puppetlabs/design-system/blob/development/CONTRIBUTING.md)
68+
- [Engineering contribution criteria](https://github.com/puppetlabs/design-system/blob/main/CONTRIBUTING.md)
6969

7070
### Review
7171

packages/react-components/source/react/library/icon/Icon.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ const Renderer = () => {
100100

101101
## Customize icon color
102102

103-
If you need a different color, you can customize it with CSS, targeting the `fill` property. The default color is defined in [_icons.scss](https://github.com/puppetlabs/design-system/blob/development/packages/react-components/source/scss/library/components/_icons.scss). You should be able to do something like `.your-icon { fill: $puppet-purple; }` with Sass.
103+
If you need a different color, you can customize it with CSS, targeting the `fill` property. The default color is defined in [_icons.scss](https://github.com/puppetlabs/design-system/blob/main/packages/react-components/source/scss/library/components/_icons.scss). You should be able to do something like `.your-icon { fill: $puppet-purple; }` with Sass.
104104

105105
```jsx
106106
<Icon type="activity" style={{ fill: '#a263ff' }} />
@@ -141,7 +141,7 @@ const Renderer = () => {
141141
3. Strip out the wrapping `svg` element, usually (but not always) leaving just a `path`.
142142
4. Remove all instances of the `fill` attribute so that icons can be styled with CSS. You may also remove `clip-rule` attributes.
143143
5. Rename dasherized attributes like `fill-rule` with React-compatible properties like `fillRule`.
144-
6. Add the icon to [icons.js](https://github.com/puppetlabs/design-system/blob/development/packages/react-components/source/react/library/icon/icons.js) in alphabetical order, specifying the icon name and native SVG sizes (from step 2).
144+
6. Add the icon to [icons.js](https://github.com/puppetlabs/design-system/blob/main/packages/react-components/source/react/library/icon/icons.js) in alphabetical order, specifying the icon name and native SVG sizes (from step 2).
145145

146146
## Disclaimer
147147

packages/react-components/source/react/library/logo/Logo.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ There are times when you might need to use only the graphical icon for a Puppet
8282
4. Remove all instances of the `fill` attribute so that icons can be styled with CSS. You may also remove `clip-rule` attributes.
8383
5. Rename dasherized attributes like `fill-rule` with React-compatible properties like `fillRule`.
8484
6. Add class names to the different `path` segments (so the component can add the correct colors on light and dark backgrounds) for `rc-logo-bug`, `rc-logo-puppet`, and `rc-logo-product`.
85-
7. Add the icon to [logos.js](https://github.com/puppetlabs/design-system/blob/development/packages/react-components/source/react/library/logo/logos.js), using the same format with viewBox dimensions (from step 2) in a separate property.
85+
7. Add the icon to [logos.js](https://github.com/puppetlabs/design-system/blob/main/packages/react-components/source/react/library/logo/logos.js), using the same format with viewBox dimensions (from step 2) in a separate property.
8686

8787
## Related
8888

0 commit comments

Comments
 (0)