From ee1874ebc8b72cae2f9153f3605f8a8790e189b7 Mon Sep 17 00:00:00 2001 From: Dave Gandy Date: Thu, 14 Jun 2012 17:08:29 -0400 Subject: [PATCH] updating gh-pages to match master --- assets/css/font-awesome.css | 2 +- assets/css/site.css | 2 +- assets/js/index/index.js | 7 ++++--- assets/less/font-awesome.less | 2 +- index.html | 38 ++++++++++++++++++++++++++--------- 5 files changed, 36 insertions(+), 15 deletions(-) diff --git a/assets/css/font-awesome.css b/assets/css/font-awesome.css index 8cf46c09a..d1f1974a3 100644 --- a/assets/css/font-awesome.css +++ b/assets/css/font-awesome.css @@ -107,7 +107,7 @@ li[class^="icon-"].icon-large:before, li[class*=" icon-"].icon-large:before { .icon-play-circle:before { content: "\f01d"; } .icon-repeat:before { content: "\f01e"; } -/* \f020 is not a valid unicode character. all shifted one down */ +/* \f020 doesn't work in Safari. all shifted one down */ .icon-refresh:before { content: "\f021"; } .icon-list-alt:before { content: "\f022"; } .icon-lock:before { content: "\f023"; } diff --git a/assets/css/site.css b/assets/css/site.css index f0f0d3edf..6db5c84c0 100644 --- a/assets/css/site.css +++ b/assets/css/site.css @@ -3933,7 +3933,7 @@ ul.icons li .icon-large:before { .icon-repeat:before { content: "\f01e"; } -/* \f020 is not a valid unicode character. all shifted one down */ +/* \f020 doesn't work in Safari. all shifted one down */ .icon-refresh:before { content: "\f021"; } diff --git a/assets/js/index/index.js b/assets/js/index/index.js index e26a6e4dc..18dc296b4 100644 --- a/assets/js/index/index.js +++ b/assets/js/index/index.js @@ -17,11 +17,11 @@ $(function() { } }); $.ajax({ - url: 'http://github.com/api/v2/json/repos/show/FortAwesome/Font-Awesome', + url: 'https://api.github.com/repos/fortawesome/Font-Awesome', dataType: 'jsonp', success: function(data) { - $('#watchers').html(data.repository.watchers); - $('#forks').html(data.repository.forks); + $('#watchers').html(data.data.watchers); + $('#forks').html(data.data.forks); } }); @@ -45,6 +45,7 @@ $(function() { var $item = $(event.currentTarget); var $iconName = $item.find("i").attr("class"); + _gaq.push(['_trackEvent', 'iconClick', $iconName]); mainRouter.navigate("icon/" + $iconName, {trigger: true}); firstInHistory = false; diff --git a/assets/less/font-awesome.less b/assets/less/font-awesome.less index 413abc98a..c9aa54f98 100644 --- a/assets/less/font-awesome.less +++ b/assets/less/font-awesome.less @@ -131,7 +131,7 @@ ul.icons { .icon-play-circle:before { content: "\f01d"; } .icon-repeat:before { content: "\f01e"; } -/* \f020 is not a valid unicode character. all shifted one down */ +/* \f020 doesn't work in Safari. all shifted one down */ .icon-refresh:before { content: "\f021"; } .icon-list-alt:before { content: "\f022"; } .icon-lock:before { content: "\f023"; } diff --git a/index.html b/index.html index cf79b9cd3..e16a92149 100644 --- a/index.html +++ b/index.html @@ -24,6 +24,18 @@ + + @@ -77,15 +89,23 @@
- - + + + +

Font Awesome

The iconic font designed for use with Twitter Bootstrap

- Download Font
Awesome v2.0 - View Project
on GitHub + + Download Font
Awesome v2.0 + + View Project
on GitHub
@@ -871,11 +891,11 @@

Easily replace individual bullets.

 <ul class="icons">
-  <li><i class="icon-ok"><i> Lists</li>
-  <li><i class="icon-ok"><i> Buttons</li>
-  <li><i class="icon-ok"><i> Button groups</li>
-  <li><i class="icon-ok"><i> Navigation</li>
-  <li><i class="icon-ok"><i> Prepended form inputs</li>
+  <li><i class="icon-ok"></i> Lists</li>
+  <li><i class="icon-ok"></i> Buttons</li>
+  <li><i class="icon-ok"></i> Button groups</li>
+  <li><i class="icon-ok"></i> Navigation</li>
+  <li><i class="icon-ok"></i> Prepended form inputs</li>
 </ul>