diff --git a/_config.yml b/_config.yml index fe560a316..955650490 100644 --- a/_config.yml +++ b/_config.yml @@ -19,9 +19,11 @@ font_awesome: version: 3.1.0 url: http://fontawesome.io legacy_url: http://fortawesome.github.com/Font-Awesome/ + twitter: fortaweso_me author: name: Dave Gandy email: dave@fontawesome.io + twitter: byscuits github: url: https://github.com/FortAwesome/Font-Awesome project: Font-Awesome diff --git a/build/_includes/contribute.html b/build/_includes/community.html similarity index 70% rename from build/_includes/contribute.html rename to build/_includes/community.html index 5c51777ee..498f14d7c 100644 --- a/build/_includes/contribute.html +++ b/build/_includes/community.html @@ -1,12 +1,58 @@ {% 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. + Font Awesome has a vibrant community of folks helping each other out. You can + get support, + report bugs, + request new icons, + submit pull requests, and + check upcoming milestones.

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

Getting Support

+

+ Having trouble getting Font Awesome up and running? Something not working the way you think it should? I hate that + I don't have time to answer Font Awesome support emails anymore. So here are some things you might wanna do: +

+
    +
  1. + Make sure you've read the latest version of how to get started. + It's been updated recently to make Font Awesome even easier to use. +
    2. +
  2. + Check out the existing questions tagged as + Font Awesome over on Stack Overflow. Other folks might have had the same question you've had. +
    3. +
  3. + 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. +
    4. +
+
+ +
+

Reporting Bugs

+

+ Found a problem with Font Awesome? Feel free to submit an issue on the GitHub project. But please keep the following 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. + Before opening any issue, please read the generic issue + guidelines, by Nicolas Gallagher. +
    4. +
  4. + After doing everything above, feel free to + submit an issue. +
    5. +
+
+ +

Requesting New Icons

New icons mostly start as requests by the @@ -32,28 +78,9 @@ to represent happiness. It's easier to make a smiley face. -

- -
-

Reporting Bugs

-

- Found a problem with Font Awesome? Feel free to submit an issue on the GitHub project. But please keep the following 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. - Before opening any issue, please read the generic issue - guidelines, by Nicolas Gallagher. -
    4. -
  4. - After doing everything above, feel free to - submit an issue. -
    5. -
-
+

Submitting Pull Requests

Found a way to solve a bug in Font Awesome? Want to contribute new features? Here are a few things to remember:
    @@ -66,7 +93,7 @@
-
+

Project Milestones

Want to keep up with what's planned for Font Awesome? Check out our diff --git a/build/_includes/icons/new.html b/build/_includes/icons/new.html index 9984ee2d6..0108304ab 100644 --- a/build/_includes/icons/new.html +++ b/build/_includes/icons/new.html @@ -6,7 +6,7 @@

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

You asked, Font Awesome delivers with {{ site.font_awesome.new_icon_count }} shiny new icons in version {{ site.font_awesome.version }}. - Want to request new icons? Here's how to request new icons. + Want to request new icons? Here's how to request new icons.

{% if page.navbar_active == "icons" %} diff --git a/build/_includes/navbar.html b/build/_includes/navbar.html index ed661845e..83583a80e 100644 --- a/build/_includes/navbar.html +++ b/build/_includes/navbar.html @@ -30,7 +30,7 @@ What's New - Contribute + Community License
    diff --git a/build/_includes/whats-new.html b/build/_includes/whats-new.html index 529097381..7c5fe2a67 100644 --- a/build/_includes/whats-new.html +++ b/build/_includes/whats-new.html @@ -2,7 +2,7 @@

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

    {% endcapture %} {% include stripe-ad.html %} diff --git a/build/assets/font-awesome/font/FontAwesome.otf b/build/assets/font-awesome/font/FontAwesome.otf index 5460623e5..5c9505f65 100644 Binary files a/build/assets/font-awesome/font/FontAwesome.otf and b/build/assets/font-awesome/font/FontAwesome.otf differ diff --git a/build/contribute/index.html b/build/community/index.html similarity index 67% rename from build/contribute/index.html rename to build/community/index.html index 78f90a602..6132b7a10 100644 --- a/build/contribute/index.html +++ b/build/community/index.html @@ -1,15 +1,15 @@ --- layout: base -title: How to Contribute to Font Awesome -navbar_active: contribute +title: The Font Awesome Community +navbar_active: community relative_path: ../ --- -{% capture jumbotron_h1 %}  Contribute{% endcapture %} +{% capture jumbotron_h1 %}  Community{% endcapture %} {% capture jumbotron_p %}Lots of ways to get involved with Font Awesome{% endcapture %} {% include jumbotron.html %} {% include stripe-social.html %}
    - {% include contribute.html %} + {% include community.html %}