diff --git a/CNAME b/CNAME new file mode 100644 index 000000000..f13145254 --- /dev/null +++ b/CNAME @@ -0,0 +1 @@ +fontawesome.io \ No newline at end of file diff --git a/_config.yml b/_config.yml index 034f78a3c..19cb92816 100644 --- a/_config.yml +++ b/_config.yml @@ -15,16 +15,19 @@ icon_meta: build/icons.yml icon_layout: icon.html # Relative to _layouts directory icon_destination: icon # Relative to destination -font-awesome: +font_awesome: version: 3.1.0 - url: http://fortawesome.github.com/Font-Awesome/ + url: http://fontawesome.io + legacy_url: http://fortawesome.github.com/Font-Awesome/ author: name: Dave Gandy - email: dave@davegandy.com + email: dave@fontawesome.io github: url: https://github.com/FortAwesome/Font-Awesome project: Font-Awesome org: FortAwesome + icon_count: 281 + new_icon_count: 32 bootstrap: version: 2.3.1 diff --git a/build/_includes/contribute.html b/build/_includes/contribute.html index 5a83cd641..29abf6826 100644 --- a/build/_includes/contribute.html +++ b/build/_includes/contribute.html @@ -1,10 +1,46 @@ +{% capture stripe_ad_content %} +

+ Font Awesome has a vibrant community centered around the GitHub project. + You can request new icons, report bugs, submit pull requests, and check upcoming milestones. +

+{% endcapture %} +{% include stripe-ad.html %} + +
+

Requesting New Icons

+

+ New icons mostly start as requests by the + 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 and thank you if you include the following: +
      +
    • + Title your new issue + Icon request: icon-name. +
      • +
    • Include a few use cases for your requested icon. How do you plan on using it?
      • +
    • Attach a single color image or two that represent the idea you're going for.
      • +
    +
    4. +
  4. + Concrete objects make good icons, since abstract concepts are, well, abstract. It's harder to make an icon + to represent happiness. It's easier to make a smiley face. +
    5. +
+
+

GitHub Project

Found a bug? Want to request a new icon? Want to see what's up next for the project? - Submit an issue or a - pull request on the - GitHub project. Here are a few guidelines: + Submit an issue or a + pull request on the + GitHub project. Here are a few guidelines:

  1. Be nice. No one likes a jackass.
    2. diff --git a/build/_includes/examples.html b/build/_includes/examples.html index b618dcb22..e7ea29193 100644 --- a/build/_includes/examples.html +++ b/build/_includes/examples.html @@ -106,7 +106,7 @@

    - Font Awesome
    Version {{ site.font-awesome.version }}     + Font Awesome
    Version {{ site.font_awesome.version }}

    Synchronizing Content...
    @@ -246,7 +246,7 @@ Use a few of the new styles together ... lots of new possibilities. Settings

    - Font Awesome
    Version {{ site.font-awesome.version }}     + Font Awesome
    Version {{ site.font_awesome.version }}

    Synchronizing Content... diff --git a/build/_includes/footer.html b/build/_includes/footer.html index 6608ce0e7..a039edff3 100644 --- a/build/_includes/footer.html +++ b/build/_includes/footer.html @@ -1,7 +1,7 @@

    diff --git a/build/_includes/get-started.html b/build/_includes/get-started.html index f7d7a8fa0..1137d7b7d 100644 --- a/build/_includes/get-started.html +++ b/build/_includes/get-started.html @@ -1,17 +1,11 @@ -
    -
    -
    -

    - Setting up Font Awesome can be as simple as adding two lines of code to your website, or you can be a pro and - customize the LESS yourself! Font Awesome even plays nicely with - Bootstrap! -

    -
    -
    - {% include ads/carbon-light-horizontal.html %} -
    -
    -
    +{% capture stripe_ad_content %} +

    + Setting up Font Awesome can be as simple as adding two lines of code to your website, or you can be a pro and + customize the LESS yourself! Font Awesome even plays nicely with + Bootstrap! +

    +{% endcapture %} +{% include stripe-ad.html %}

    EASIEST: BootstrapCDN

    @@ -21,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. diff --git a/build/_includes/icons/new.html b/build/_includes/icons/new.html index addf23a74..68ae07892 100644 --- a/build/_includes/icons/new.html +++ b/build/_includes/icons/new.html @@ -1,11 +1,11 @@ -
    +
    {% if page.navbar_active == "icons" %}
    {% endif %} -

    New Icons in {{ site.font-awesome.version }}

    +

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

    - You asked, Font Awesome delivers with 40 shiny new icons in version {{ site.font-awesome.version }}. New icons can be requested on the + You asked, Font Awesome delivers with {{ site.font_awesome.new_icon_count }} shiny new icons in version {{ site.font_awesome.version }}. New icons can be requested on the Font Awesome GitHub project.

    {% if page.navbar_active == "icons" %} diff --git a/build/_includes/jumbotron-slider.html b/build/_includes/jumbotron-slider.html index 80dab513f..128458b92 100644 --- a/build/_includes/jumbotron-slider.html +++ b/build/_includes/jumbotron-slider.html @@ -6,7 +6,7 @@

    Font Awesome

    The iconic font designed for Bootstrap

    -    Download @@ -14,10 +14,10 @@
    - GitHub Project   ·   - Version {{ site.font-awesome.version }}   ·   + Version {{ site.font_awesome.version }}   ·   Created & Maintained by Dave Gandy
    diff --git a/build/_includes/roadmap.html b/build/_includes/license.html similarity index 100% rename from build/_includes/roadmap.html rename to build/_includes/license.html diff --git a/build/_includes/navbar.html b/build/_includes/navbar.html index be4d54ea8..31158730f 100644 --- a/build/_includes/navbar.html +++ b/build/_includes/navbar.html @@ -9,10 +9,10 @@ Examples What's New Contribute - Roadmap + License
    diff --git a/build/_includes/stripe-ad.html b/build/_includes/stripe-ad.html new file mode 100644 index 000000000..cdcbd308f --- /dev/null +++ b/build/_includes/stripe-ad.html @@ -0,0 +1,10 @@ +
    +
    +
    + {{ stripe_ad_content }} +
    +
    + {% include ads/carbon-light-horizontal.html %} +
    +
    +
    diff --git a/build/_includes/stripe-social.html b/build/_includes/stripe-social.html index 6c51bcb9a..1aaddd0b3 100644 --- a/build/_includes/stripe-social.html +++ b/build/_includes/stripe-social.html @@ -11,7 +11,7 @@
  2. - +
    3. diff --git a/build/_includes/whats-new.html b/build/_includes/whats-new.html index 121fca5ae..89a991c15 100644 --- a/build/_includes/whats-new.html +++ b/build/_includes/whats-new.html @@ -1,44 +1,39 @@ +{% 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? + Help contribute. +

    +{% endcapture %} +{% include stripe-ad.html %} +
    -
    -
    -

    - 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? - Help contribute. -

    -
    -
    - {% include ads/carbon-light-horizontal.html %} -
    -
    - -

    Pixel Perfection at 14px

    Every single icon re-created from the ground up to be optimized for Bootstrap's default 14px.
    -

    Font Sub-setting

    - Thanks to @grantgordon and @johnsmclay, you can subset to get just the icons you need. +

    Font Subsetting

    + Thanks to @grantgordon and @johnsmclay, you can subset to get just the icons you need.
    -

    Better License

    - SIL open font license, MIT license for code. No more attribution required, but much appreciated. +

    Better License

    + SIL OFL 1.1 for font, MIT license for code. No more attribution required, but much appreciated.
    -

    40 New Icons in 3.0

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

    {{ site.font_awesome.new_icon_count }} New Icons in 3.0

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

    New Styles

    - New styles for animated spinning icons, icons with 2x-4x size multipliers, icon borders, & more. +

    New Styles

    + New styles for animated spinning icons, icons with 2x-4x size multipliers, icon borders, & more.

    28% Smaller Payload

    - 3.0 is smaller, even with 16% more icons. Crazy small if you subset just the icons you need. + 3.0 is smaller, even with 16% more icons. Crazy small if you subset just the icons you need.
    diff --git a/build/_includes/why.html b/build/_includes/why.html index b67293d3e..89e31c952 100644 --- a/build/_includes/why.html +++ b/build/_includes/why.html @@ -1,22 +1,22 @@
    -

    One font, 249 icons

    +

    One Font, {{ site.font_awesome.icon_count }} Icons

    In a single collection, Font Awesome is a pictographic language of web-related actions.
    -

    CSS control

    +

    CSS Control

    Easily style icon color, size, shadow, and anything that's possible with CSS.
    -

    Infinite scalability

    +

    Infinite Scalability

    Scalable vector graphics means every icon looks awesome at any size.

    Free, as in Beer

    - Font Awesome is completely free for commercial use. Check out the license. + Font Awesome is completely free for commercial use. Check out the license.

    IE7 Support

    @@ -30,14 +30,14 @@

    Made for Bootstrap

    - Designed from scratch to be fully compatible with Bootstrap {{ site.bootstrap.version }}. + Designed from scratch to be fully compatible with Bootstrap {{ site.bootstrap.version }}.

    Designer Friendly

    - Install FontAwesome.otf and visit the copy & paste page. Happy designing. + Install FontAwesome.otf and visit the copy & paste page. Happy designing.
    -

    Screen reader compatible

    +

    Screen Reader Compatible

    Font Awesome won't trip up screen readers, unlike other icon fonts.
    diff --git a/build/_layouts/icon.html b/build/_layouts/icon.html index ea17b624d..79fcf5122 100755 --- a/build/_layouts/icon.html +++ b/build/_layouts/icon.html @@ -16,7 +16,7 @@ title_prefix: Font Awesome Icons icon-{{ page.icon['id'] }} · - Unicode: {{ page.icon['unicode'] }} · + Unicode: {{ page.icon['unicode'] }} · Created: v{{ page.icon['created'] }} · Categories: {% for category in page.icon['categories'] %} diff --git a/build/assets/css/site.css b/build/assets/css/site.css index e31680a87..5d9a316e1 100644 --- a/build/assets/css/site.css +++ b/build/assets/css/site.css @@ -5457,6 +5457,12 @@ body { .strike { text-decoration: line-through; } +.upper { + text-transform: uppercase; +} +.lower { + text-transform: lowercase; +} .navbar .brand { font-family: museo-slab, "Helvetica Neue", Helvetica, Arial, sans-serif; } @@ -5768,12 +5774,15 @@ section { #whats-new .row { margin-bottom: 20px; } -#why h4 [class^="icon-"], -#whats-new h4 [class^="icon-"], -#why h4 [class*=" icon-"], -#whats-new h4 [class*=" icon-"] { +#why h4 [class^="icon-"]:before, +#whats-new h4 [class^="icon-"]:before, +#why h4 [class*=" icon-"]:before, +#whats-new h4 [class*=" icon-"]:before { vertical-align: -10%; font-size: 28px; + display: inline-block; + width: 1.0714285714285714em; + text-align: center; margin-right: 5px; } #examples .btn-toolbar { diff --git a/build/assets/less/lazy.less b/build/assets/less/lazy.less index 34e22fc15..3c914de8c 100644 --- a/build/assets/less/lazy.less +++ b/build/assets/less/lazy.less @@ -81,3 +81,5 @@ } } .strike { text-decoration: line-through; } +.upper { text-transform: uppercase; } +.lower { text-transform: lowercase; } diff --git a/build/assets/less/site.less b/build/assets/less/site.less index afc28e77f..caa27ab4c 100644 --- a/build/assets/less/site.less +++ b/build/assets/less/site.less @@ -262,18 +262,25 @@ section { margin-bottom: 20px; } h4 { -// line-height: 28px; - [class^="icon-"], - [class*=" icon-"] { + [class^="icon-"]:before, + [class*=" icon-"]:before { vertical-align: -10%; font-size: 28px; -// width: 30px; -// height: 30px; + display: inline-block; + width: 30/28em; + text-align: center; margin-right: 5px; +// color: mix(@grayLight, @grayLighter, 70%); + + // Gradient on the icons +// background: -webkit-linear-gradient(mix(@grayLight, @grayLighter, 50%), mix(@gray, @grayLight, 50%)); +// -webkit-background-clip: text; +// -webkit-text-fill-color: transparent; } } } + #examples { .btn-toolbar { margin-top: 0; diff --git a/build/contribute/index.html b/build/contribute/index.html index 2cce857f6..e8639d6ba 100644 --- a/build/contribute/index.html +++ b/build/contribute/index.html @@ -4,7 +4,7 @@ title: How to Contribute to Font Awesome navbar_active: contribute --- {% capture jumbotron_h1 %}  Contribute{% endcapture %} -{% capture jumbotron_p %}A few ways to get involved with Font Awesome{% endcapture %} +{% capture jumbotron_p %}Lots of ways to get involved with Font Awesome{% endcapture %} {% include jumbotron.html %} {% include stripe-social.html %} diff --git a/build/get-started/index.html b/build/get-started/index.html index 72541b23b..5482076d5 100644 --- a/build/get-started/index.html +++ b/build/get-started/index.html @@ -4,7 +4,7 @@ title: Get Started with Font Awesome navbar_active: get-started --- {% 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.font_awesome.version }} onto your website{% endcapture %} {% include jumbotron.html %} {% include stripe-social.html %} diff --git a/build/icons/index.html b/build/icons/index.html index d752b5c0b..5932d8ce3 100644 --- a/build/icons/index.html +++ b/build/icons/index.html @@ -4,7 +4,7 @@ title: Font Awesome Icons navbar_active: icons --- {% capture jumbotron_h1 %}  The Icons{% endcapture %} -{% capture jumbotron_p %}The complete set of 249 icons in Font Awesome {{ site.font-awesome.version }}{% endcapture %} +{% capture jumbotron_p %}The complete set of {{ site.font_awesome.icon_count }} icons in Font Awesome {{ site.font_awesome.version }}{% endcapture %} {% include jumbotron.html %} {% include stripe-social.html %} diff --git a/build/index.html b/build/index.html index c24cc5139..6c1dab997 100644 --- a/build/index.html +++ b/build/index.html @@ -8,20 +8,13 @@ navbar_active: home {% include stripe-social.html %}
    -
    -
    -
    -
    - Font Awesome gives you scalable vector icons that can instantly be customized — size, color, drop shadow, - or anything that can be done with the power of CSS. -
    - -
    -
    - {% include ads/carbon-light-horizontal.html %} -
    -
    -
    + {% capture stripe_ad_content %} +

    + Font Awesome gives you scalable vector icons that can instantly be customized — size, color, drop shadow, + and anything that can be done with the power of CSS. +

    + {% endcapture %} + {% include stripe-ad.html %} {% include why.html %} {% include special-thanks.html %} diff --git a/build/license/index.html b/build/license/index.html new file mode 100644 index 000000000..80432ed1b --- /dev/null +++ b/build/license/index.html @@ -0,0 +1,14 @@ +--- +layout: base +title: Font Awesome License +navbar_active: license +--- +{% capture jumbotron_h1 %}  License{% endcapture %} +{% capture jumbotron_p %}The full details of how Font Awesome is licensed{% endcapture %} + +{% include jumbotron.html %} +{% include stripe-social.html %} + +
    + {% include license.html %} +
    diff --git a/build/roadmap/index.html b/build/roadmap/index.html deleted file mode 100644 index cbd619672..000000000 --- a/build/roadmap/index.html +++ /dev/null @@ -1,14 +0,0 @@ ---- -layout: base -title: Font Awesome Roadmap -navbar_active: roadmap ---- -{% capture jumbotron_h1 %}  Roadmap{% endcapture %} -{% capture jumbotron_p %}The plan for future updates to Font Awesome{% endcapture %} - -{% include jumbotron.html %} -{% include stripe-social.html %} - -
    - {% include roadmap.html %} -
    diff --git a/build/whats-new/index.html b/build/whats-new/index.html index 9000c811c..474ed3d56 100644 --- a/build/whats-new/index.html +++ b/build/whats-new/index.html @@ -4,7 +4,7 @@ title: What's New navbar_active: whats-new --- {% 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.font_awesome.version }}{% endcapture %} {% include jumbotron.html %} {% include stripe-social.html %}