Skip to content

Commit 6c29e17

Browse files
committed
Merge remote-tracking branch 'upstream/main' into animated-webp
2 parents aef159c + e94208c commit 6c29e17

File tree

552 files changed

+16732
-6013
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

552 files changed

+16732
-6013
lines changed

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
.DS_Store
22
*.swp
33
node_modules/
4-
dist/
4+
dist/
5+
.idea
6+
xml_output/

CONTRIBUTING.md

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,17 @@ Links between docs can be achieved by using a hash symbol (#), plus the markdown
3838

3939
### Alert Boxes
4040

41-
Alert boxes are created using a block quote that has one of 'warn', 'danger', 'info', or 'preview' on the first line.
42-
For example:
41+
Alert boxes are created by placing a line with 3 colons (`:::`) before and after the text. The first 3 colons must be followed by a label specifying the alert box type. For example, to create a warning alert:
42+
4343
```
44-
> warn
45-
> Something that requires warning here
44+
:::warn
45+
Something that requires warning here
46+
:::
4647
```
4748

48-
![Alert options](images/alerts.png)
49+
Currently the following types are available: `info`, `warn`, `danger` and `preview`
50+
51+
![Available alert types](static/images/alerts.png)
4952

5053
### MDX Components
5154

@@ -56,6 +59,7 @@ There are a few reusable MDX components that can be used on pages with the `mdx`
5659
Collapsibles allow you to show/hide content on a page that may be secondary to the page's primary content. They have four fields that can be set: `title`, `description`, `icon`, and an `open` flag (which makes the collapsible element open by default).
5760

5861
Available options for `icon`:
62+
5963
- `"list"`
6064
- `"view"`
6165
- `"question"`
@@ -64,7 +68,7 @@ Available options for `icon`:
6468

6569
###### Example
6670

67-
![Collapsible MDX Component with the list icon](images/mdx-collapsible.png)
71+
![Collapsible MDX Component with the list icon](static/images/mdx-collapsible.png)
6872

6973
```markdown
7074
<Collapsible title="Title" description="Description text" icon="list">
@@ -78,7 +82,7 @@ Buttons are simply... clickable buttons. They take `href` and `color` as argumen
7882

7983
###### Example
8084

81-
![Button MDX Component](images/mdx-button.png)
85+
![Button MDX Component](static/images/mdx-button.png)
8286

8387
```markdown
8488
<LinkButton to="https://discord.com/developers/docs/getting-started" color="brand">click the button!</LinkButton>
@@ -90,7 +94,7 @@ Cards let you display links in a card format. They accept two arguments, `title`
9094

9195
###### Example
9296

93-
![Card MDX Component](images/mdx-card.png)
97+
![Card MDX Component](static/images/mdx-card.png)
9498

9599
```markdown
96100
<Card title="Card Title" link="https://discord.com/developers/docs/getting-started">

LICENSE

Lines changed: 427 additions & 94 deletions
Large diffs are not rendered by default.

LICENSE-CODE

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,24 @@
11
MIT License
22

3-
Copyright 2016-Present Discord
3+
Copyright (c) 2016 Discord
44

5-
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
5+
Permission is hereby granted, free of charge, to any person
6+
obtaining a copy of this software and associated documentation
7+
files (the "Software"), to deal in the Software without
8+
restriction, including without limitation the rights to use,
9+
copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
copies of the Software, and to permit persons to whom the
11+
Software is furnished to do so, subject to the following
12+
conditions:
613

7-
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
14+
The above copyright notice and this permission notice shall be
15+
included in all copies or substantial portions of the Software.
816

9-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
17+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
18+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
19+
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
20+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
21+
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
22+
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
23+
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
24+
OTHER DEALINGS IN THE SOFTWARE.

docs/Intro.mdx

Lines changed: 0 additions & 76 deletions
This file was deleted.

0 commit comments

Comments
 (0)