Skip to content

Commit

Permalink
Merge branch 'main' into data-table-overflow
Browse files Browse the repository at this point in the history
  • Loading branch information
kodiakhq[bot] authored Apr 22, 2022
2 parents 544cc9a + d7e7865 commit 1be326c
Show file tree
Hide file tree
Showing 29 changed files with 1,250 additions and 26 deletions.
10 changes: 10 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -867,6 +867,16 @@
"code"
]
},
{
"login": "NashJames",
"name": "James Nash",
"avatar_url": "https://avatars.githubusercontent.com/u/37304960?v=4",
"profile": "https://github.com/NashJames",
"contributions": [
"code",
"doc"
]
},
{
"login": "jakubfaliszewski",
"name": "Jakub Faliszewski",
Expand Down
10 changes: 10 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Auto detect text files and perform LF normalization
* text=auto

# These files should have specific line endings
*.sh text eol=lf
*.bat text eol=crlf

# These files are binary and should be left untouched
# (binary is a macro for -text -diff)
*.jpeg binary
7 changes: 4 additions & 3 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ installed:
version manager for Node.
- Git
- [Yarn](https://yarnpkg.com/en/docs/install)
- [WSL](../docs/guides/setup/windows.md) (Windows Only)

If you're using Windows, there are some
[additional steps](https://github.com/carbon-design-system/carbon/blob/main/docs/guides/setup/windows.md)
Expand Down Expand Up @@ -163,15 +164,15 @@ run the following commands from the root of the repo:

```sh
# Add new contributor <username>, who made a contribution of type <contribution>
all-contributors add <username> <contribution>
yarn all-contributors add <username> <contribution>
# Example:
all-contributors add tw15egan code,doc
yarn all-contributors add tw15egan code,doc
```

Then, you'll need to generate the updated `all-contributors` table by running

```sh
all-contributors generate
yarn all-contributors generate
```

### 8. Make a pull request
Expand Down
6 changes: 3 additions & 3 deletions CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
* @carbon-design-system/developers-system

# Core icons and pictograms
/packages/icons/src/svg/ @laurenmrice @conradennis @dudley-ibm @carbon-design-system/developers-system
/packages/pictograms/src/svg/ @laurenmrice @conradennis @dudley-ibm @carbon-design-system/developers-system
/packages/icons/src/svg/ @laurenmrice @carbon-design-system/brand-icons @carbon-design-system/developers-system
/packages/pictograms/src/svg/ @laurenmrice @carbon-design-system/brand-pictograms @carbon-design-system/developers-system

# Angular icons
/packages/icons-angular/ @cal-smith @carbon-design-system/developers-system
/packages/icons-angular/ @carbon-design-system/developers-system

# Brand
/packages/colors/artifacts/ @lisalind-ibm
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@ check out our [Contributing Guide](/.github/CONTRIBUTING.md) and our
<td align="center"><a href="https://github.com/motou"><img src="https://avatars.githubusercontent.com/u/1215956?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Zhen Wang</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=motou" title="Code">💻</a> <a href="https://github.com/carbon-design-system/carbon/commits?author=motou" title="Documentation">📖</a></td>
<td align="center"><a href="https://github.com/Kman316"><img src="https://avatars.githubusercontent.com/u/25666525?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Cathal Kenneally</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=Kman316" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/dezkareid"><img src="https://avatars.githubusercontent.com/u/1269896?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Joel Humberto Gómez Paredes</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=dezkareid" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/NashJames"><img src="https://avatars.githubusercontent.com/u/37304960?v=4?s=100" width="100px;" alt=""/><br /><sub><b>James Nash</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=NashJames" title="Code">💻</a> <a href="https://github.com/carbon-design-system/carbon/commits?author=NashJames" title="Documentation">📖</a></td>
<td align="center"><a href="http://jakubfaliszewski.github.io/portfolio/"><img src="https://avatars.githubusercontent.com/u/25402419?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jakub Faliszewski</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=jakubfaliszewski" title="Code">💻</a></td>
</tr>
</table>
Expand Down
26 changes: 26 additions & 0 deletions docs/guides/dns.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# DNS

> This documentation covers the ways we set DNS for our website
## Website

We use GitHub Pages to publish our website and make this website available under
https://carbondesignsystem.com.

In order to do so, we have the following checklist in terms of what the project
must do on GitHub along with the DNS configuration through our DNS provider.

**Checklist**

- The GitHub repository has enabled GitHub Pages
- The repository has published the site under the `gh-pages` branch
- The `gh-pages` branch has a CNAME record for `carbondesignsystem.com`
- The DNS provider has A records for the apex domain
- [IP Addresses for GitHub Pages](https://docs.github.com/en/pages/configuring-a-custom-domain-for-your-github-pages-site/managing-a-custom-domain-for-your-github-pages-site#configuring-an-apex-domain)
- The DNS provider has a CNAME record that points to
carbon-design-system.github.io

**Links & Resources**

- https://docs.github.com/en/pages/configuring-a-custom-domain-for-your-github-pages-site/managing-a-custom-domain-for-your-github-pages-site#configuring-an-apex-domain-and-the-www-subdomain-variant
- https://github.blog/changelog/2021-04-08-github-pages-can-now-automatically-secure-the-www-variant-of-your-custom-domain/
18 changes: 18 additions & 0 deletions docs/guides/setup/windows.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,21 @@ but can be unexpected.
15. In the root folder of your freshly cloned repo install and build
- `yarn install`
- `yarn build`

## Commits on Windows 10

Unfortunately, there is a known bug on Windows GitHub Desktop with pre-commit
hooks. The current workaround is to use a `--no-verify` tag on git CLI.

To commit all staged changes:

```
git commit -am "commit message" --no-verify
```

To commit specific files:

```
git add file_name
git commit -m "commit message" --no-verify
```
Loading

0 comments on commit 1be326c

Please sign in to comment.