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.2.1-wip' of github.com:FortAwesome/Font-Awesome into 4.2.1-wip

Browse Source 
* '4.2.1-wip' of github.com:FortAwesome/Font-Awesome:
  Correct bootstrapcdn link
  Rename dot-circle-o to match naming conventions
  Punctuation fix.
  remove reference to bootstrap in getting-started
This commit is contained in:
Geremia Taglialatela 2014-11-08 16:30:28 +01:00
commit ac4eb9e368
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CONTRIBUTING.md
View File

@ -74,7 +74,7 @@ As of v3.2.0, Font Awesome's CSS, LESS, SCSS, and documentation are all powered
- Multiple-line approach (one property and value per line) - Multiple-line approach (one property and value per line)
- Always a space after a property's colon (.e.g, `display: block;` and not `display:block;`) - Always a space after a property's colon (.e.g, `display: block;` and not `display:block;`)
- End all lines with a semi-colon - End all lines with a semi-colon
- For multiple, comma-separated selectors, place each selector on it's own line - For multiple, comma-separated selectors, place each selector on its own line
- Attribute selectors, like `input[type="text"]` should always wrap the attribute's value in double quotes, for consistency and safety (see this [blog post on unquoted attribute values](http://mathiasbynens.be/notes/unquoted-attribute-values) that can lead to XSS attacks) - Attribute selectors, like `input[type="text"]` should always wrap the attribute's value in double quotes, for consistency and safety (see this [blog post on unquoted attribute values](http://mathiasbynens.be/notes/unquoted-attribute-values) that can lead to XSS attacks)

2
src/_includes/thanks-to.html
View File

@ -18,7 +18,7 @@
<div class="col-md-4 col-sm-4"> <div class="col-md-4 col-sm-4">
<p> <p>
Thanks to <a href="http://maxcdn.com"><i class="fa fa-maxcdn">&nbsp;</i>MaxCDN</a> for providing the excellent Thanks to <a href="http://maxcdn.com"><i class="fa fa-maxcdn">&nbsp;</i>MaxCDN</a> for providing the excellent
<a href="http://www.bootstrapcdn.com/#tab_fontawesome">BootstrapCDN</a>, the fastest and easiest way to <a href="http://www.bootstrapcdn.com/#fontawesome_tab">BootstrapCDN</a>, the fastest and easiest way to
<a href="{{ page.relative_path }}get-started/#bootstrapcdn">get started</a> with Font Awesome. <a href="{{ page.relative_path }}get-started/#bootstrapcdn">get started</a> with Font Awesome.
</p> </p>
</div> </div>

2
src/get-started.html
View File

@ -43,7 +43,7 @@ relative_path: ../
<section id="default-css"> <section id="default-css">
<h2 class="page-header">EASY: Default CSS</h2> <h2 class="page-header">EASY: Default CSS</h2>
<p>Use this method to get the default Font Awesome CSS with the default Bootstrap CSS.</p> <p>Use this method to get the default Font Awesome CSS.</p>
<ol> <ol>
<li>Copy the entire <code>font-awesome</code> directory into your project.</li> <li>Copy the entire <code>font-awesome</code> directory into your project.</li>
<li> <li>

2
src/icons.yml
View File

@ -2687,7 +2687,7 @@ icons:
- Web Application Icons - Web Application Icons
- Directional Icons - Directional Icons
- name: Dot Circle O - name: Dot Circle Outlined
id: dot-circle-o id: dot-circle-o
unicode: f192 unicode: f192
created: 4.0 created: 4.0