diff --git a/_config.yml b/_config.yml index 0bc98775f..f98899fd3 100644 --- a/_config.yml +++ b/_config.yml @@ -15,12 +15,13 @@ icon_meta: build/icons.yml icon_layout: icon.html # Relative to _layouts directory icon_destination: icon # Relative to destination -font_awesome: +fontawesome: version: 3.2.0 url: http://fontawesome.io legacy_url: http://fortawesome.github.com/Font-Awesome/ blog_url: http://blog.fontawesome.io twitter: fontawesome + tagline: The iconic font for designed Bootstrap author: name: Dave Gandy email: dave@fontawesome.io @@ -33,18 +34,17 @@ font_awesome: url: https://github.com/FortAwesome/Font-Awesome project: Font-Awesome org: FortAwesome + license: + font: + version: SIL OFL 1.1 + url: http://scripts.sil.org/OFL + code: + version: MIT License + url: http://opensource.org/licenses/mit-license.html + documentation: + version: CC BY 3.0 + url: http://creativecommons.org/licenses/by/3.0/ bootstrap: version: 2.3.1 url: http://getbootstrap.com - -license: - font: - version: SIL OFL 1.1 - url: http://scripts.sil.org/OFL - code: - version: MIT License - url: http://opensource.org/licenses/mit-license.html - documentation: - version: CC BY 3.0 - url: http://creativecommons.org/licenses/by/3.0/ diff --git a/build/_includes/cheatsheet.html b/build/_includes/cheatsheet.html index 6038ec09f..81e508c45 100644 --- a/build/_includes/cheatsheet.html +++ b/build/_includes/cheatsheet.html @@ -6,7 +6,7 @@ {% endcapture %} {% include stripe-ad.html %} -

Every Font Awesome {{ site.font_awesome.version }} Icon, CSS Class, & Unicode

+

Every Font Awesome {{ site.fontawesome.version }} Icon, CSS Class, & Unicode

{% for icon in icons %} diff --git a/build/_includes/community/getting-support.html b/build/_includes/community/getting-support.html index a50c2394c..8ae311adc 100644 --- a/build/_includes/community/getting-support.html +++ b/build/_includes/community/getting-support.html @@ -16,7 +16,7 @@
  • Can't find the answer to your question on Stack Overflow? Ask a new question, then - send me an email and I might be able to take a look. + send me an email and I might be able to take a look.
    • diff --git a/build/_includes/community/project-milestones.html b/build/_includes/community/project-milestones.html index 67f5ce242..ba2a4e493 100644 --- a/build/_includes/community/project-milestones.html +++ b/build/_includes/community/project-milestones.html @@ -2,6 +2,6 @@

    Project Milestones

    Want to keep up with what's planned for Font Awesome? Check out our - milestones on the GitHub project. + milestones on the GitHub project.

    diff --git a/build/_includes/community/reporting-bugs.html b/build/_includes/community/reporting-bugs.html index 4262b74b7..3dde63fa5 100644 --- a/build/_includes/community/reporting-bugs.html +++ b/build/_includes/community/reporting-bugs.html @@ -5,14 +5,14 @@

    1. Please be nice. Font Awesome is a happy place.
      2. -
    2. Please search to see if your icon request already exists.
      3. +
    3. Please search to see if your icon request already exists.
    4. Before opening any issue, please read the generic issue guidelines, by Nicolas Gallagher.
    5. After doing everything above, feel free to - submit an issue. + submit an issue.
    diff --git a/build/_includes/community/requesting-new-icons.html b/build/_includes/community/requesting-new-icons.html index cce3c84c1..d710e2bb1 100644 --- a/build/_includes/community/requesting-new-icons.html +++ b/build/_includes/community/requesting-new-icons.html @@ -2,17 +2,17 @@

    Requesting New Icons

    New icons mostly start as requests by the - Font Awesome community on GitHub. Want to request a new + Font Awesome community on GitHub. Want to request a new icon? Here are some things to keep in mind:

    1. Please be nice. Font Awesome is a happy place.
      2. -
    2. Please search to see if your icon request already exists.
      3. +
    3. Please search to see if your icon request already exists.
    4. Please and thank you if you include the following:
    diff --git a/build/_includes/examples/buttons.html b/build/_includes/examples/buttons.html index 37e2a7d90..b8d147c07 100644 --- a/build/_includes/examples/buttons.html +++ b/build/_includes/examples/buttons.html @@ -22,7 +22,7 @@

    - Font Awesome
    Version {{ site.font_awesome.version }}     + Font Awesome
    Version {{ site.fontawesome.version }}

    @@ -48,7 +48,7 @@ Settings - Font Awesome
    Version {{ site.font_awesome.version }}     + Font Awesome
    Version {{ site.fontawesome.version }} Synchronizing Content... {% endhighlight %} diff --git a/build/_includes/examples/new.html b/build/_includes/examples/new.html index 32f17dd67..883697960 100644 --- a/build/_includes/examples/new.html +++ b/build/_includes/examples/new.html @@ -1,5 +1,5 @@ <{% if page.navbar_active == "examples" %}div{% else %}section{% endif %} id="new-styles"> -

    New Styles in {{ site.font_awesome.version }}

    +

    New Styles in {{ site.fontawesome.version }}

    Rotated and Flipped Icons

    diff --git a/build/_includes/footer.html b/build/_includes/footer.html index 971733478..e388e1b23 100644 --- a/build/_includes/footer.html +++ b/build/_includes/footer.html @@ -1,21 +1,21 @@ diff --git a/build/_includes/get-started.html b/build/_includes/get-started.html index 5e6ced1ad..de4ef36a2 100644 --- a/build/_includes/get-started.html +++ b/build/_includes/get-started.html @@ -15,7 +15,7 @@ Paste the following code into the <head> section of your site's HTML. {% highlight html %} - + {% endhighlight %}
    Want to use Font Awesome by itself without Bootstrap? Just don't include the first line. @@ -89,7 +89,8 @@ {% endhighlight %} + +{% endhighlight %}
  • Go complain to whoever decided your project needs IE7 support.
    • diff --git a/build/_includes/icons.html b/build/_includes/icons.html index 8963c9bed..e553b7b39 100644 --- a/build/_includes/icons.html +++ b/build/_includes/icons.html @@ -1,8 +1,8 @@ {% capture stripe_ad_content %}

    - You asked, Font Awesome delivers with {{ icons | version:site.font_awesome.version | size }} shiny new icons in version {{ site.font_awesome.version }}. + You asked, Font Awesome delivers with {{ icons | version:site.fontawesome.version | size }} shiny new icons in version {{ site.fontawesome.version }}. Want to request new icons? Here's how. - + Need vectors or want to use on the desktop? Check the cheatsheet.

    {% endcapture %} diff --git a/build/_includes/icons/new.html b/build/_includes/icons/new.html index e9cd2e019..ebb2bb961 100644 --- a/build/_includes/icons/new.html +++ b/build/_includes/icons/new.html @@ -1,14 +1,14 @@ <{% if page.navbar_active == "icons" %}div{% else %}section{% endif %} id="new"> -

    New Icons in {{ site.font_awesome.version }}

    +

    New Icons in {{ site.fontawesome.version }}

    {% if page.navbar_active != "icons" %}
    - You asked, Font Awesome delivers with {{ icons | version:site.font_awesome.version | size }} shiny new icons in version {{ site.font_awesome.version }}. + You asked, Font Awesome delivers with {{ icons | version:site.fontawesome.version | size }} shiny new icons in version {{ site.fontawesome.version }}. Want to request new icons? Here's how.
    {% endif %}
    - {% assign icons_new = icons | version:site.font_awesome.version %} + {% assign icons_new = icons | version:site.fontawesome.version %} {% for icon in icons_new %}
    icon-{{ icon.id }}
    {% for alias in icon.aliases %} diff --git a/build/_includes/jumbotron-slider.html b/build/_includes/jumbotron-slider.html index 6d7684b32..4d4797cb9 100644 --- a/build/_includes/jumbotron-slider.html +++ b/build/_includes/jumbotron-slider.html @@ -13,11 +13,11 @@
    - GitHub Project   ·   - Version {{ site.font_awesome.version }}   ·   - Created & Maintained by Dave Gandy + Version {{ site.fontawesome.version }}   ·   + Created & Maintained by Dave Gandy
    diff --git a/build/_includes/license-code.less b/build/_includes/license-code.less index 719cef608..940e9a586 100644 --- a/build/_includes/license-code.less +++ b/build/_includes/license-code.less @@ -1,25 +1,25 @@ /*! - * Font Awesome {{ site.font_awesome.version }} + * Font Awesome {{ site.fontawesome.version }} * the iconic font designed for Bootstrap * ------------------------------------------------------------------------------ * The full suite of pictographic icons, examples, and documentation can be - * found at {{ site.font_awesome.url }}. Stay up to date on Twitter at - * http://twitter.com/{{ site.font_awesome.twitter }}. + * found at {{ site.fontawesome.url }}. Stay up to date on Twitter at + * http://twitter.com/{{ site.fontawesome.twitter }}. * * License * ------------------------------------------------------------------------------ - * - The Font Awesome font is licensed under {{ site.license.font.version }} - - * {{ site.license.font.url }} - * - Font Awesome CSS, LESS, and SASS files are licensed under {{ site.license.code.version }} - - * {{ site.license.code.url }} - * - Font Awesome documentation licensed under {{ site.license.documentation.version }} - - * {{ site.license.documentation.url }} + * - The Font Awesome font is licensed under {{ site.fontawesome.license.font.version }} - + * {{ site.fontawesome.license.font.url }} + * - Font Awesome CSS, LESS, and SASS files are licensed under {{ site.fontawesome.license.code.version }} - + * {{ site.fontawesome.license.code.url }} + * - Font Awesome documentation licensed under {{ site.fontawesome.license.documentation.version }} - + * {{ site.fontawesome.license.documentation.url }} * - Attribution is no longer required in Font Awesome 3.0, but much appreciated: - * "Font Awesome by Dave Gandy - {{ site.font_awesome.url }}" + * "Font Awesome by Dave Gandy - {{ site.fontawesome.url }}" * * Author - Dave Gandy * ------------------------------------------------------------------------------ - * Email: {{ site.font_awesome.author.email }} - * Twitter: http://twitter.com/{{ site.font_awesome.author.twitter }} - * Work: {{ site.font_awesome.author.work.title }} @ {{ site.font_awesome.author.work.name }} - {{ site.font_awesome.author.work.url }} + * Email: {{ site.fontawesome.author.email }} + * Twitter: http://twitter.com/{{ site.fontawesome.author.twitter }} + * Work: {{ site.fontawesome.author.work.title }} @ {{ site.fontawesome.author.work.name }} - {{ site.fontawesome.author.work.url }} */ \ No newline at end of file diff --git a/build/_includes/license.html b/build/_includes/license.html index 941319927..06ee35f5f 100644 --- a/build/_includes/license.html +++ b/build/_includes/license.html @@ -20,8 +20,8 @@ Applies to all desktop and webfont files in the following directory: font-awesome/font/. -
  • License: {{ site.license.font.version }}
    • -
  • URL: {{ site.license.font.url }}
    • +
  • License: {{ site.fontawesome.license.font.version }}
    • +
  • URL: {{ site.fontawesome.license.font.url }}
    • @@ -33,8 +33,8 @@ font-awesome/css/ and font-awesome/less/. -
  • License: {{ site.license.code.version }}
    • -
  • URL: {{ site.license.code.url }}
    • +
  • License: {{ site.fontawesome.license.code.version }}
    • +
  • URL: {{ site.fontawesome.license.code.url }}
    • @@ -42,8 +42,8 @@

    Documentation License

    diff --git a/build/_includes/navbar.html b/build/_includes/navbar.html index d9cf68304..2535e4859 100644 --- a/build/_includes/navbar.html +++ b/build/_includes/navbar.html @@ -13,7 +13,7 @@
    diff --git a/build/_includes/stripe-social.html b/build/_includes/stripe-social.html index f60d1fe77..c8bc59139 100644 --- a/build/_includes/stripe-social.html +++ b/build/_includes/stripe-social.html @@ -8,10 +8,10 @@
  • - Follow @{{ site.font_awesome.twitter }} + Follow @{{ site.fontawesome.twitter }}
  • - Tweet + Tweet
    • diff --git a/build/_includes/whats-new.html b/build/_includes/whats-new.html index ab0bd68a7..e24562f06 100644 --- a/build/_includes/whats-new.html +++ b/build/_includes/whats-new.html @@ -1,7 +1,7 @@ {% capture stripe_ad_content %}

    Font Awesome is always getting a little awesome-er. So here's what's new in the latest version, Font Awesome - {{ site.font_awesome.version }}. Have some ideas for new features? + {{ site.fontawesome.version }}. Have some ideas for new features? Help contribute.

    {% endcapture %} @@ -10,8 +10,8 @@
    -

    {{ icons | version:site.font_awesome.version | size }} New Icons in {{ site.font_awesome.version }}

    - Requested by the active community on the Font Awesome GitHub project. +

    {{ icons | version:site.fontawesome.version | size }} New Icons in {{ site.fontawesome.version }}

    + Requested by the active community on the Font Awesome GitHub project.

    Better & Simpler License

    @@ -36,7 +36,7 @@

    Want More Details?

    - Check out the CHANGELOG on the GitHub project to see + Check out the CHANGELOG on the GitHub project to see what's new and changed.
    diff --git a/build/assets/font-awesome/less/variables.less b/build/assets/font-awesome/less/variables.less index fb14160fb..a20cf81be 100644 --- a/build/assets/font-awesome/less/variables.less +++ b/build/assets/font-awesome/less/variables.less @@ -4,8 +4,8 @@ // -------------------------- @FontAwesomePath: "../font"; -//@FontAwesomePath: "//netdna.bootstrapcdn.com/font-awesome/{{ site.font_awesome.version}}/font"; // for referencing Bootstrap CDN font files directly -@FontAwesomeVersion: "{{ site.font_awesome.version }}"; +//@FontAwesomePath: "//netdna.bootstrapcdn.com/font-awesome/{{ site.fontawesome.version}}/font"; // for referencing Bootstrap CDN font files directly +@FontAwesomeVersion: "{{ site.fontawesome.version }}"; @borderColor: #eee; @iconMuted: #eee; @iconLight: #fff; diff --git a/build/cheatsheet.html b/build/cheatsheet.html index d75fd1c72..7a843b971 100644 --- a/build/cheatsheet.html +++ b/build/cheatsheet.html @@ -4,7 +4,7 @@ title: Font Awesome Cheatsheet relative_path: ../ --- {% capture jumbotron_h1 %}  Cheatsheet{% endcapture %} -{% capture jumbotron_p %}The complete Font Awesome {{ site.font_awesome.version }} icon reference{% endcapture %} +{% capture jumbotron_p %}The complete Font Awesome {{ site.fontawesome.version }} icon reference{% endcapture %} {% include jumbotron.html %} {% include stripe-social.html %} diff --git a/build/get-started.html b/build/get-started.html index 82ed583eb..31e204932 100644 --- a/build/get-started.html +++ b/build/get-started.html @@ -5,7 +5,7 @@ navbar_active: get-started relative_path: ../ --- {% capture jumbotron_h1 %}  Get Started{% endcapture %} -{% capture jumbotron_p %}Easy ways to get Font Awesome {{ site.font_awesome.version }} onto your website{% endcapture %} +{% capture jumbotron_p %}Easy ways to get Font Awesome {{ site.fontawesome.version }} onto your website{% endcapture %} {% include jumbotron.html %} {% include stripe-social.html %} diff --git a/build/icons.html b/build/icons.html index a4885557e..6dc589d8c 100644 --- a/build/icons.html +++ b/build/icons.html @@ -5,7 +5,7 @@ navbar_active: icons relative_path: ../ --- {% capture jumbotron_h1 %}  The Icons{% endcapture %} -{% capture jumbotron_p %}The complete set of {{ icons | size }} icons in Font Awesome {{ site.font_awesome.version }}{% endcapture %} +{% capture jumbotron_p %}The complete set of {{ icons | size }} icons in Font Awesome {{ site.fontawesome.version }}{% endcapture %} {% include jumbotron.html %} {% include stripe-social.html %} diff --git a/build/whats-new.html b/build/whats-new.html index 138ffe133..7ae9493b6 100644 --- a/build/whats-new.html +++ b/build/whats-new.html @@ -5,7 +5,7 @@ navbar_active: whats-new relative_path: ../ --- {% capture jumbotron_h1 %}  What's New{% endcapture %} -{% capture jumbotron_p %}What's New in the latest version — Font Awesome {{ site.font_awesome.version }}{% endcapture %} +{% capture jumbotron_p %}What's New in the latest version — Font Awesome {{ site.fontawesome.version }}{% endcapture %} {% include jumbotron.html %} {% include stripe-social.html %} diff --git a/package.json b/package.json index 01ceb2b10..92497d8f6 100644 --- a/package.json +++ b/package.json @@ -6,12 +6,32 @@ "homepage": "http://fontawesome.io/", "author": { "name": "Dave Gandy", - "email": "dave@fontawesome.io" + "email": "dave@fontawesome.io", + "web": "http://twitter.com/byscuits" }, "repository": { "type": "git", "url": "https://github.com/FortAwesome/Font-Awesome.git" }, + "contributors": [ + { + "name": "Dave Gandy", + "email": "dave@fontawesome.io", + "web": "http://scripts.sil.org/OFL" + }, + { + "name": "Rob Madole", + "web": "http://twitter.com/robmadole" + }, + { + "name": "Geremia Taglialatela", + "web": "http://twitter.com/gtagliala" + }, + { + "name": "Travis Chase", + "web": "http://twitter.com/supercodepoet" + } + ], "licenses": [ { "type": "SIL OFL 1.1", @@ -20,13 +40,10 @@ { "type": "MIT License", "url": "http://opensource.org/licenses/mit-license.html" - }, - { - "type": "CC BY 3.0", - "url": "http://creativecommons.org/licenses/by/3.0/" } ], - "devDependencies": { - "recess": "1.1.6" + "dependencies": { + "jekyll": "1.0.2", + "lessc": "1.3.3" } }