FlandreScarle7/Font-Awesome
1
0
Fork 0
mirror of https://github.com/FortAwesome/Font-Awesome.git synced 2024-12-28 22:41:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '4.0.4-wip' of github.com:FortAwesome/Font-Awesome into 4.0.4-wip

Browse Source 
* '4.0.4-wip' of github.com:FortAwesome/Font-Awesome:
  hand-deleted changes
  Update README.md
  ensure PR on the dev branch
  referenced .min.css file for CDN
This commit is contained in:
Geremia Taglialatela 2013-11-28 20:40:51 +01:00
commit 849af133ab
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
README.md
View File

@ -1,4 +1,4 @@
#[Font Awesome v4.0.3](http://fontawesome.io) #[Font Awesome v4.0.4](http://fontawesome.io)
###the iconic font designed for Bootstrap ###the iconic font designed for Bootstrap
Font Awesome is a full suite of 369 pictographic icons for easy scalable vector graphics on websites, created and Font Awesome is a full suite of 369 pictographic icons for easy scalable vector graphics on websites, created and
@ -29,6 +29,11 @@ Get started at http://fontawesome.io!
- [v4.0.1 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=7&page=1&state=closed) - [v4.0.1 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=7&page=1&state=closed)
- [v4.0.2 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=8&page=1&state=closed) - [v4.0.2 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=8&page=1&state=closed)
- [v4.0.3 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=9&page=1&state=closed) - [v4.0.3 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=9&page=1&state=closed)
- [v4.0.4 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=10&page=1&state=closed)
## Contributing
Please read through our [contributing guidelines](https://github.com/FortAwesome/Font-Awesome/blob/master/CONTRIBUTING.md). Included are directions for opening issues, coding standards, and notes on development.
##Versioning ##Versioning

2
src/get-started.html
View File

@ -27,7 +27,7 @@ relative_path: ../
<li> <li>
Paste the following code into the <code>&lt;head&gt;</code> section of your site's HTML. Paste the following code into the <code>&lt;head&gt;</code> section of your site's HTML.
{% highlight html %} {% highlight html %}
<link href="//netdna.bootstrapcdn.com/font-awesome/{{ site.fontawesome.version }}/css/font-awesome.css" rel="stylesheet"> <link href="//netdna.bootstrapcdn.com/font-awesome/{{ site.fontawesome.version }}/css/font-awesome.min.css" rel="stylesheet">
{% endhighlight %} {% endhighlight %}
<p class="alert alert-success"><i class="fa fa-info-circle"></i> Immediately after release, it takes a bit of time for BootstrapCDN to catch up and get the newest version live on their CDN.</p> <p class="alert alert-success"><i class="fa fa-info-circle"></i> Immediately after release, it takes a bit of time for BootstrapCDN to catch up and get the newest version live on their CDN.</p>
</li> </li>