Skip to content

Commit

Permalink
Merge branch 'master' of github.com:squidfunk/mkdocs-material
Browse files Browse the repository at this point in the history
  • Loading branch information
squidfunk committed Apr 29, 2020
2 parents d3452af + 82f2a0a commit fe81490
Show file tree
Hide file tree
Showing 5,953 changed files with 8,277 additions and 4,537 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
6 changes: 3 additions & 3 deletions docs/getting-started.md
Expand Up @@ -527,15 +527,15 @@ theme:
All icons are directly inlined as `*.svg` files, so no further requests will be
made. Icon sets which are bundled with Material for MkDocs:

* [Material Design icons][16] (`material`): 3.8k icons
* [FontAwesome icons][17] (`fontawesome`): 1.5k icons
* [Material Design icons][16] (`material`): 5.1k icons
* [FontAwesome icons][17] (`fontawesome`): 1.6k icons
* [GitHub's Octicons][18] (`octicons`): 200 icons

__You can use all those icons [directly from :fontawesome-brands-markdown:
Markdown][19]!__

[15]: #adding-social-links
[16]: https://material.io/resources/icons/
[16]: https://materialdesignicons.com/
[17]: https://fontawesome.com/icons?d=gallery&m=free
[18]: https://octicons.github.com/
[19]: extensions/pymdown.md#icons
Expand Down
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion material/.icons/fontawesome/brands/amazon-pay.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion material/.icons/fontawesome/brands/android.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion material/.icons/fontawesome/brands/artstation.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion material/.icons/fontawesome/brands/aws.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit fe81490

Please sign in to comment.