From 950526864ef13771881469bf42ca244cc4141dd1 Mon Sep 17 00:00:00 2001 From: davegandy Date: Thu, 23 May 2013 13:14:14 -0400 Subject: [PATCH] merged rob's badass build system in with makefile after jekyll, made cheatsheet auto generating, make icon-fixed-width align right to ensure no pixelization, got rid of line numbers, fixed license typo, clarified that font awesome is free as in speech, not free as in beer --- _config.yml | 1 + build/Makefile | 10 +- build/_includes/cheatsheet.html | 327 +----------------- .../_includes/examples/animated-spinner.html | 2 +- build/_includes/examples/bordered-pulled.html | 4 +- build/_includes/examples/bulleted-lists.html | 2 +- .../_includes/examples/button-dropdowns.html | 2 +- build/_includes/examples/button-groups.html | 2 +- build/_includes/examples/buttons.html | 2 +- build/_includes/examples/form-inputs.html | 2 +- build/_includes/examples/inline-icons.html | 2 +- build/_includes/examples/larger-icons.html | 2 +- build/_includes/examples/navigation.html | 2 +- build/_includes/examples/rotated-flipped.html | 2 +- build/_includes/examples/stacked.html | 2 +- build/_includes/get-started.html | 8 +- build/_includes/license.html | 2 +- build/_includes/navbar.html | 6 +- build/_includes/why.html | 4 +- build/_layouts/icon.html | 2 +- build/assets/font-awesome/less/core.less | 7 +- build/icons.yml | 1 + 22 files changed, 44 insertions(+), 350 deletions(-) diff --git a/_config.yml b/_config.yml index fc182f581..f35fcc086 100644 --- a/_config.yml +++ b/_config.yml @@ -19,6 +19,7 @@ font_awesome: version: 3.2.0 url: http://fontawesome.io legacy_url: http://fortawesome.github.com/Font-Awesome/ + blog_url: http://blog.fontawesome.io twitter: fontawesome author: name: Dave Gandy diff --git a/build/Makefile b/build/Makefile index 7a5ded376..c9e545f60 100644 --- a/build/Makefile +++ b/build/Makefile @@ -15,13 +15,13 @@ FA_CSS_IE7_MIN = ${FA_CSS_DIRECTORY}/font-awesome-ie7.min.css build: @echo "Compiling Less files" @mkdir -p ${FA_CSS_DIRECTORY} - recess --compile ${FA_LESS_MODERN} > ${FA_CSS_MODERN} - recess --compile --compress ${FA_LESS_MODERN} > ${FA_CSS_MODERN_MIN} - recess --compile ${FA_LESS_IE7} > ${FA_CSS_IE7} - recess --compile --compress ${FA_LESS_IE7} > ${FA_CSS_IE7_MIN} + lessc ${FA_LESS_MODERN} > ${FA_CSS_MODERN} + lessc --compress ${FA_LESS_MODERN} > ${FA_CSS_MODERN_MIN} + lessc ${FA_LESS_IE7} > ${FA_CSS_IE7} + lessc --compress ${FA_LESS_IE7} > ${FA_CSS_IE7_MIN} default: build -.PHONE: build +.PHONY: build diff --git a/build/_includes/cheatsheet.html b/build/_includes/cheatsheet.html index ef49a9259..6038ec09f 100644 --- a/build/_includes/cheatsheet.html +++ b/build/_includes/cheatsheet.html @@ -6,323 +6,14 @@ {% endcapture %} {% include stripe-ad.html %} -
-

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

-
-
-
    -
  • icon-glass ()
    • -
  • icon-music ()
    • -
  • icon-search ()
    • -
  • icon-envelope ()
    • -
  • icon-heart ()
    • -
  • icon-star ()
    • -
  • icon-star-empty ()
    • -
  • icon-user ()
    • -
  • icon-film ()
    • -
  • icon-th-large ()
    • -
  • icon-th ()
    • -
  • icon-th-list ()
    • -
  • icon-ok ()
    • -
  • icon-remove ()
    • -
  • icon-zoom-in ()
    • -
  • icon-zoom-out ()
    • -
  • icon-off ()
    • -
  • icon-signal ()
    • -
  • icon-cog ()
    • -
  • icon-trash ()
    • -
  • icon-home ()
    • -
  • icon-file ()
    • -
  • icon-time ()
    • -
  • icon-road ()
    • -
  • icon-download-alt ()
    • -
  • icon-download ()
    • -
  • icon-upload ()
    • -
  • icon-inbox ()
    • -
  • icon-play-circle ()
    • -
  • icon-repeat ()
    • -
  • icon-refresh ()
    • -
  • icon-list-alt ()
    • -
  • icon-lock ()
    • -
  • icon-flag ()
    • -
  • icon-headphones ()
    • -
  • icon-volume-off ()
    • -
  • icon-volume-down ()
    • -
  • icon-volume-up ()
    • -
  • icon-qrcode ()
    • -
  • icon-barcode ()
    • -
  • icon-tag ()
    • -
  • icon-tags ()
    • -
  • icon-book ()
    • -
  • icon-bookmark ()
    • -
  • icon-print ()
    • -
  • icon-camera ()
    • -
  • icon-font ()
    • -
  • icon-bold ()
    • -
  • icon-italic ()
    • -
  • icon-text-height ()
    • -
  • icon-text-width ()
    • -
  • icon-align-left ()
    • -
  • icon-align-center ()
    • -
  • icon-align-right ()
    • -
  • icon-align-justify ()
    • -
  • icon-list ()
    • -
  • icon-indent-left ()
    • -
  • icon-indent-right ()
    • -
  • icon-facetime-video ()
    • -
  • icon-picture ()
    • -
  • icon-pencil ()
    • -
  • icon-map-marker ()
    • -
  • icon-adjust ()
    • -
  • icon-tint ()
    • -
  • icon-edit ()
    • -
  • icon-share ()
    • -
  • icon-check ()
    • -
  • icon-move ()
    • -
  • icon-step-backward ()
    • -
  • icon-fast-backward ()
    • -
  • icon-backward ()
    • -
  • icon-play ()
    • -
  • icon-pause ()
    • -
  • icon-stop ()
    • -
  • icon-forward ()
    • -
  • icon-fast-forward ()
    • -
  • icon-step-forward ()
    • -
  • icon-eject ()
    • -
  • icon-chevron-left ()
    • -
  • icon-chevron-right ()
    • -
  • icon-plus-sign ()
    • -
  • icon-minus-sign ()
    • -
  • icon-remove-sign ()
    • -
  • icon-ok-sign ()
    • -
  • icon-question-sign ()
    • -
  • icon-info-sign ()
    • -
  • icon-screenshot ()
    • -
  • icon-remove-circle ()
    • -
  • icon-ok-circle ()
    • -
  • icon-ban-circle ()
    • -
  • icon-arrow-left ()
    • -
  • icon-arrow-right ()
    • -
  • icon-arrow-up ()
    • -
  • icon-arrow-down ()
    • -
  • icon-share-alt ()
    • -
  • icon-resize-full ()
    • -
  • icon-resize-small ()
    • -
  • icon-plus ()
    • -
  • icon-minus ()
    • -
  • icon-asterisk ()
    • -
  • icon-exclamation-sign ()
    • -
-
-
-
    -
  • icon-gift ()
    • -
  • icon-leaf ()
    • -
  • icon-fire ()
    • -
  • icon-eye-open ()
    • -
  • icon-eye-close ()
    • -
  • icon-warning-sign ()
    • -
  • icon-plane ()
    • -
  • icon-calendar ()
    • -
  • icon-random ()
    • -
  • icon-comment ()
    • -
  • icon-magnet ()
    • -
  • icon-chevron-up ()
    • -
  • icon-chevron-down ()
    • -
  • icon-retweet ()
    • -
  • icon-shopping-cart ()
    • -
  • icon-folder-close ()
    • -
  • icon-folder-open ()
    • -
  • icon-resize-vertical ()
    • -
  • icon-resize-horizontal ()
    • -
  • icon-bar-chart ()
    • -
  • icon-twitter-sign ()
    • -
  • icon-facebook-sign ()
    • -
  • icon-camera-retro ()
    • -
  • icon-key ()
    • -
  • icon-cogs ()
    • -
  • icon-comments ()
    • -
  • icon-thumbs-up ()
    • -
  • icon-thumbs-down ()
    • -
  • icon-star-half ()
    • -
  • icon-heart-empty ()
    • -
  • icon-signout ()
    • -
  • icon-linkedin-sign ()
    • -
  • icon-pushpin ()
    • -
  • icon-external-link ()
    • -
  • icon-signin ()
    • -
  • icon-trophy ()
    • -
  • icon-github-sign ()
    • -
  • icon-upload-alt ()
    • -
  • icon-lemon ()
    • -
  • icon-phone ()
    • -
  • icon-check-empty ()
    • -
  • icon-bookmark-empty ()
    • -
  • icon-phone-sign ()
    • -
  • icon-twitter ()
    • -
  • icon-facebook ()
    • -
  • icon-github ()
    • -
  • icon-unlock ()
    • -
  • icon-credit-card ()
    • -
  • icon-rss ()
    • -
  • icon-hdd ()
    • -
  • icon-bullhorn ()
    • -
  • icon-bell ()
    • -
  • icon-certificate ()
    • -
  • icon-hand-right ()
    • -
  • icon-hand-left ()
    • -
  • icon-hand-up ()
    • -
  • icon-hand-down ()
    • -
  • icon-circle-arrow-left ()
    • -
  • icon-circle-arrow-right ()
    • -
  • icon-circle-arrow-up ()
    • -
  • icon-circle-arrow-down ()
    • -
  • icon-globe ()
    • -
  • icon-wrench ()
    • -
  • icon-tasks ()
    • -
  • icon-filter ()
    • -
  • icon-briefcase ()
    • -
  • icon-fullscreen ()
    • -
  • icon-group ()
    • -
  • icon-link ()
    • -
  • icon-cloud ()
    • -
  • icon-beaker ()
    • -
  • icon-cut ()
    • -
  • icon-copy ()
    • -
  • icon-paper-clip ()
    • -
  • icon-save ()
    • -
  • icon-sign-blank ()
    • -
  • icon-reorder ()
    • -
  • icon-list-ul ()
    • -
  • icon-list-ol ()
    • -
  • icon-strikethrough ()
    • -
  • icon-underline ()
    • -
  • icon-table ()
    • -
  • icon-magic ()
    • -
  • icon-truck ()
    • -
  • icon-pinterest ()
    • -
  • icon-pinterest-sign ()
    • -
  • icon-google-plus-sign ()
    • -
  • icon-google-plus ()
    • -
  • icon-money ()
    • -
  • icon-caret-down ()
    • -
  • icon-caret-up ()
    • -
  • icon-caret-left ()
    • -
  • icon-caret-right ()
    • -
  • icon-columns ()
    • -
  • icon-sort ()
    • -
  • icon-sort-down ()
    • -
  • icon-sort-up ()
    • -
  • icon-envelope-alt ()
    • -
  • icon-linkedin ()
    • -
  • icon-undo ()
    • -
  • icon-legal ()
    • -
-
-
-
    -
  • icon-dashboard ()
    • -
  • icon-comment-alt ()
    • -
  • icon-comments-alt ()
    • -
  • icon-bolt ()
    • -
  • icon-sitemap ()
    • -
  • icon-umbrella ()
    • -
  • icon-paste ()
    • -
  • icon-lightbulb ()
    • -
  • icon-exchange ()
    • -
  • icon-cloud-download ()
    • -
  • icon-cloud-upload ()
    • -
  • icon-user-md ()
    • -
  • icon-stethoscope ()
    • -
  • icon-suitcase ()
    • -
  • icon-bell-alt ()
    • -
  • icon-coffee ()
    • -
  • icon-food ()
    • -
  • icon-file-alt ()
    • -
  • icon-building ()
    • -
  • icon-hospital ()
    • -
  • icon-ambulance ()
    • -
  • icon-medkit ()
    • -
  • icon-fighter-jet ()
    • -
  • icon-beer ()
    • -
  • icon-h-sign ()
    • -
  • icon-plus-sign-alt ()
    • -
  • icon-double-angle-left ()
    • -
  • icon-double-angle-right ()
    • -
  • icon-double-angle-up ()
    • -
  • icon-double-angle-down ()
    • -
  • icon-angle-left ()
    • -
  • icon-angle-right ()
    • -
  • icon-angle-up ()
    • -
  • icon-angle-down ()
    • -
  • icon-desktop ()
    • -
  • icon-laptop ()
    • -
  • icon-tablet ()
    • -
  • icon-mobile-phone ()
    • -
  • icon-circle-blank ()
    • -
  • icon-quote-left ()
    • -
  • icon-quote-right ()
    • -
  • icon-spinner ()
    • -
  • icon-circle ()
    • -
  • icon-reply ()
    • -
  • icon-folder-close-alt ()
    • -
  • icon-folder-open-alt ()
    • -
  • icon-expand-alt ()
    • -
  • icon-collapse-alt ()
    • -
  • icon-smile ()
    • -
  • icon-frown ()
    • -
  • icon-meh ()
    • -
  • icon-gamepad ()
    • -
  • icon-keyboard ()
    • -
  • icon-flag-alt ()
    • -
  • icon-flag-checkered ()
    • -
  • icon-terminal ()
    • -
  • icon-code ()
    • -
  • icon-reply-all ()
    • -
  • icon-mail-reply-all ()
    • -
  • icon-star-half-full ()
    • -
  • icon-star-half-empty ()
    • -
  • icon-location-arrow ()
    • -
  • icon-crop ()
    • -
  • icon-code-fork ()
    • -
  • icon-unlink ()
    • -
  • icon-question ()
    • -
  • icon-info ()
    • -
  • icon-exclamation ()
    • -
  • icon-superscript ()
    • -
  • icon-subscript ()
    • -
  • icon-eraser ()
    • -
  • icon-puzzle-piece ()
    • -
  • icon-microphone ()
    • -
  • icon-microphone-off ()
    • -
  • icon-shield ()
    • -
  • icon-calendar-empty ()
    • -
  • icon-fire-extinguisher ()
    • -
  • icon-rocket ()
    • -
  • icon-maxcdn ()
    • -
  • icon-chevron-sign-left ()
    • -
  • icon-chevron-sign-right ()
    • -
  • icon-chevron-sign-up ()
    • -
  • icon-chevron-sign-down ()
    • -
  • icon-html5 ()
    • -
  • icon-css3 ()
    • -
  • icon-anchor ()
    • -
  • icon-unlock-alt ()
    • -
  • icon-bullseye ()
    • -
  • icon-ellipsis-horizontal ()
    • -
  • icon-ellipsis-vertical ()
    • -
  • icon-rss-sign ()
    • -
  • icon-play-sign ()
    • -
  • icon-ticket ()
    • -
  • icon-minus-sign-alt ()
    • -
  • icon-check-minus ()
    • -
  • icon-level-up ()
    • -
  • icon-level-down ()
    • -
  • icon-check-sign ()
    • -
  • icon-edit-sign ()
    • -
  • icon-external-link-sign ()
    • -
  • icon-share-sign ()
    • -
-
+

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

+ +
+{% for icon in icons %} +
+ &#x{{ icon.unicode }} + icon-{{ icon.id }} + (&#x{{ icon.unicode }};)
+{% endfor %}
diff --git a/build/_includes/examples/animated-spinner.html b/build/_includes/examples/animated-spinner.html index ef26583bd..eee013a11 100644 --- a/build/_includes/examples/animated-spinner.html +++ b/build/_includes/examples/animated-spinner.html @@ -9,7 +9,7 @@
Spinner icon when loading content...
-{% highlight html linenos %} +{% highlight html %} Spinner icon when loading content... {% endhighlight %}

diff --git a/build/_includes/examples/bordered-pulled.html b/build/_includes/examples/bordered-pulled.html index ed44be4f5..bc703b24a 100644 --- a/build/_includes/examples/bordered-pulled.html +++ b/build/_includes/examples/bordered-pulled.html @@ -14,7 +14,7 @@ Or spinning icons for loading and refreshing content. Or fun big icons in multi-line buttons. You can combine all of them in any combination to get lots of new possibilities.

-{% highlight html linenos %} +{% highlight html %} Use a few of the new styles together ... lots of new possibilities. {% endhighlight %} @@ -24,7 +24,7 @@ Use a few of the new styles together ... lots of new possibilities. Or spinning icons for loading and refreshing content. Or fun big icons in multi-line buttons. You can combine all of them in any combination to get lots of new possibilities.
-{% highlight html linenos %} +{% highlight html %} Use a few of the new styles together ... lots of new possibilities. {% endhighlight %} diff --git a/build/_includes/examples/bulleted-lists.html b/build/_includes/examples/bulleted-lists.html index 2a5513af9..e9cd6b4e2 100644 --- a/build/_includes/examples/bulleted-lists.html +++ b/build/_includes/examples/bulleted-lists.html @@ -15,7 +15,7 @@

Easily replace individual bullets.

-{% highlight html linenos %} +{% highlight html %}
-{% highlight html linenos %} +{% highlight html %}
User diff --git a/build/_includes/examples/button-groups.html b/build/_includes/examples/button-groups.html index 5f505a09a..ce4892309 100644 --- a/build/_includes/examples/button-groups.html +++ b/build/_includes/examples/button-groups.html @@ -12,7 +12,7 @@

-{% highlight html linenos %} +{% highlight html %}
diff --git a/build/_includes/examples/buttons.html b/build/_includes/examples/buttons.html index 8bbafa5ed..37e2a7d90 100644 --- a/build/_includes/examples/buttons.html +++ b/build/_includes/examples/buttons.html @@ -34,7 +34,7 @@ Font Awesome icons work great in buttons. You can even combine them with larger icon styles, pull-right and pull-left, and icon-spin.

-{% highlight html linenos %} +{% highlight html %} Reload diff --git a/build/_includes/examples/form-inputs.html b/build/_includes/examples/form-inputs.html index 1cd77012c..dcb39a8f2 100644 --- a/build/_includes/examples/form-inputs.html +++ b/build/_includes/examples/form-inputs.html @@ -14,7 +14,7 @@
-{% highlight html linenos %} +{% highlight html %}
diff --git a/build/_includes/examples/inline-icons.html b/build/_includes/examples/inline-icons.html index ee68f57b8..3965e7c2a 100644 --- a/build/_includes/examples/inline-icons.html +++ b/build/_includes/examples/inline-icons.html @@ -10,7 +10,7 @@ icon-camera-retro
-{% highlight html linenos %} +{% highlight html %} icon-camera-retro {% endhighlight %}
Icon classes are echoed via CSS :before.
diff --git a/build/_includes/examples/larger-icons.html b/build/_includes/examples/larger-icons.html index 188bd5d4b..95f1ee13b 100644 --- a/build/_includes/examples/larger-icons.html +++ b/build/_includes/examples/larger-icons.html @@ -20,7 +20,7 @@

icon-camera-retro

-{% highlight html linenos %} +{% highlight html %}

icon-camera-retro

icon-camera-retro

icon-camera-retro

diff --git a/build/_includes/examples/navigation.html b/build/_includes/examples/navigation.html index d59cc1405..850e64442 100644 --- a/build/_includes/examples/navigation.html +++ b/build/_includes/examples/navigation.html @@ -13,7 +13,7 @@

Use Font Awesome icons in navigation to provide helpful visual cues.

-{% highlight html linenos %} +{% highlight html %}
-{% highlight html linenos %} +{% highlight html %}   normal
  icon-rotate-90
  icon-rotate-180
diff --git a/build/_includes/examples/stacked.html b/build/_includes/examples/stacked.html index ebac53941..8061e05c1 100644 --- a/build/_includes/examples/stacked.html +++ b/build/_includes/examples/stacked.html @@ -23,7 +23,7 @@ icon-terminal on icon-sign-blank -{% highlight html linenos %} +{% highlight html %} diff --git a/build/_includes/get-started.html b/build/_includes/get-started.html index 24485dff3..5e6ced1ad 100644 --- a/build/_includes/get-started.html +++ b/build/_includes/get-started.html @@ -13,7 +13,7 @@
  1. Paste the following code into the <head> section of your site's HTML. -{% highlight html linenos %} +{% highlight html %} {% endhighlight %} @@ -38,7 +38,7 @@
  2. Copy the font-awesome directory into your project.
  3. In the <head> of your html, reference the location to your font-awesome.min.css. -{% highlight html linenos %} +{% highlight html %} {% endhighlight %} @@ -55,7 +55,7 @@
  4. Open bootstrap.less and replace @import "sprites.less"; with @import "path/to/font-awesome/less/font-awesome.less";
  5. Open your project's font-awesome.less and edit the @FontAwesomePath variable to point to your font directory. -{% highlight html linenos %} +{% highlight html %} @FontAwesomePath: "../font"; {% endhighlight %}

    The font path is relative from your compiled CSS directory.

    @@ -84,7 +84,7 @@
  6. Copy font-awesome-ie7.min.css into your project.
  7. In the <head> of your html, reference the location to your font-awesome-ie7.min.css. -{% highlight html linenos %} +{% highlight html %}