diff options
author | Dave Gandy <dave@davegandy.com> | 2017-05-23 23:43:44 +0300 |
---|---|---|
committer | Dave Gandy <dave@davegandy.com> | 2017-05-23 23:43:44 +0300 |
commit | ab2201e8c42c6af731a73d0e099085e17e1c6db3 (patch) | |
tree | 921caae9cab55d81710f9ae0f7a61e8c2f9b609e | |
parent | 1ca567391b7cf19e34af3e38801e36f518180d52 (diff) | |
parent | 78eb037c81056892e4df20a98480e6d7e435af65 (diff) |
Merge branch 'master' of https://github.com/FortAwesome/Font-Awesome
-rw-r--r-- | CONTRIBUTING.md | 2 | ||||
-rw-r--r-- | package.json | 2 | ||||
-rw-r--r-- | src/get-started.html | 16 | ||||
-rw-r--r-- | src/icons.yml | 31 |
4 files changed, 40 insertions, 11 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f281d304f..094cef8e6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -87,7 +87,7 @@ As of v3.2.0, Font Awesome's CSS, LESS, SCSS, and documentation are all powered - Adhere to the [Recess CSS property order](http://markdotto.com/2011/11/29/css-property-order/) - 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 - 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) diff --git a/package.json b/package.json index 86f58db06..a2bdaedec 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "description": "The iconic font and CSS framework", "version": "4.7.0", "style": "css/font-awesome.css", - "keywords": ["font", "awesome", "fontawesome", "icon", "font", "bootstrap"], + "keywords": ["font", "awesome", "fontawesome", "icon", "bootstrap"], "homepage": "http://fontawesome.io/", "bugs": { "url" : "http://github.com/FortAwesome/Font-Awesome/issues" diff --git a/src/get-started.html b/src/get-started.html index cd63636dc..48ad89f06 100644 --- a/src/get-started.html +++ b/src/get-started.html @@ -122,7 +122,7 @@ relative_path: ../ <div class="download-preprocessors" id="download-preprocessors"> <h3>Using Sass or Less</h3> - <p>Use this method to customize Font Awesome {{ site.fontawesome.version }} using LESS or SASS.</p> + <p>Use this method to customize Font Awesome {{ site.fontawesome.version }} using Less or Sass.</p> <ol> <li>Copy the <code>font-awesome/</code> directory into your project.</li> <li> @@ -133,7 +133,7 @@ relative_path: ../ {% endhighlight %} <p class="alert alert-success"><i class="fa fa-info-circle"></i> The font path is relative from your compiled CSS directory.</p> </li> - <li>Re-compile your LESS or SASS if using a static compiler. Otherwise, you should be good to go.</li> + <li>Re-compile your Less or Sass if using a static compiler. Otherwise, you should be good to go.</li> <li>Check out the <a href="{{ page.relative_path }}examples/">examples</a> to start using Font Awesome!</li> </ol> </div> @@ -150,10 +150,10 @@ relative_path: ../ </h2> <div class="ruby-gem-less margin-bottom-xl" id="ruby-gem-less"> - <h3><a href="https://github.com/FortAwesome/font-awesome-less">LESS Ruby Gem</a></h3> + <h3><a href="https://github.com/FortAwesome/font-awesome-less">Less Ruby Gem</a></h3> <p> - Use the <a href="https://github.com/FortAwesome/font-awesome-less">Official Font Awesome LESS Ruby Gem</a> to easily get Font - Awesome LESS into a Rails project. Generously maintained by <a href="https://twitter.com/supercodepoet/">@supercodepoet</a>. + Use the <a href="https://github.com/FortAwesome/font-awesome-less">Official Font Awesome Less Ruby Gem</a> to easily get Font + Awesome Less into a Rails project. Generously maintained by <a href="https://twitter.com/supercodepoet/">@supercodepoet</a>. </p> <ol> <li> @@ -184,10 +184,10 @@ $ gem install font-awesome-less </div> <div class="ruby-gem-sass" id="ruby-gem-sass"> - <h3><a href="https://github.com/FortAwesome/font-awesome-sass">SASS Ruby Gem</a></h3> + <h3><a href="https://github.com/FortAwesome/font-awesome-sass">Sass Ruby Gem</a></h3> <p> - Use the <a href="https://github.com/FortAwesome/font-awesome-sass">Official Font Awesome SASS Ruby Gem</a> to easily get Font - Awesome SASS into a Rails or Compass project. Generously maintained by <a href="https://twitter.com/supercodepoet/">@supercodepoet</a>. + Use the <a href="https://github.com/FortAwesome/font-awesome-sass">Official Font Awesome Sass Ruby Gem</a> to easily get Font + Awesome Sass into a Rails or Compass project. Generously maintained by <a href="https://twitter.com/supercodepoet/">@supercodepoet</a>. </p> <ol> <li> diff --git a/src/icons.yml b/src/icons.yml index f86e49bb0..bcc050ed2 100644 --- a/src/icons.yml +++ b/src/icons.yml @@ -40,10 +40,11 @@ icons: created: 1.0 filter: - email - - support - e-mail - letter + - support - mail + - message - notification categories: - Web Application Icons @@ -2243,6 +2244,7 @@ icons: - letter - support - mail + - message - notification categories: - Web Application Icons @@ -4040,6 +4042,14 @@ icons: id: envelope-square unicode: f199 created: 4.1 + filter: + - email + - e-mail + - letter + - support + - mail + - message + - notification categories: - Web Application Icons @@ -4776,6 +4786,9 @@ icons: id: at unicode: f1fa created: 4.2 + filter: + - email + - e-mail categories: - Web Application Icons @@ -6230,6 +6243,14 @@ icons: id: envelope-open unicode: f2b6 created: 4.7 + filter: + - email + - e-mail + - letter + - support + - mail + - message + - notification categories: - Web Application Icons @@ -6237,6 +6258,14 @@ icons: id: envelope-open-o unicode: f2b7 created: 4.7 + filter: + - email + - e-mail + - letter + - support + - mail + - message + - notification categories: - Web Application Icons |