update to fontawesome 4

author: Thomas Park <thomas@thomaspark.me> 2013-11-12 15:34:23 -0500
committer: Thomas Park <thomas@thomaspark.me> 2013-11-12 15:34:23 -0500
commit: 016d9a2ae924c3999ff9aa279511e32c0bfbe7bb (patch)
tree: c04189b0eed7025a6764360cbe3613c900353fe6 /bower_components/font-awesome/src/_layouts
parent: 61dab0661ba43d3192fa8c2945f7343df44049ed (diff)
2 files changed, 30 insertions, 39 deletions
diff --git a/bower_components/font-awesome/src/_layouts/base.html b/bower_components/font-awesome/src/_layouts/base.html
index 76de7cb4..55c547ad 100644
--- a/bower_components/font-awesome/src/_layouts/base.html
+++ b/bower_components/font-awesome/src/_layouts/base.html
@@ -1,34 +1,26 @@
 <!DOCTYPE html>
-<!--[if lt IE 7 ]><html class="ie ie6" lang="en"> <![endif]-->
-<!--[if IE 7 ]><html class="ie ie7" lang="en"> <![endif]-->
-<!--[if IE 8 ]><html class="ie ie8" lang="en"> <![endif]-->
-<!--[if (gte IE 9)|!(IE)]><!-->
-<html lang="en" xmlns="http://www.w3.org/1999/html"> <!--<![endif]-->
+<html lang="en">
 <head>
   <!-- Basic Page Needs
  ================================================== -->
   <meta charset="utf-8" />
-  <title>{% if page.title %}{{ page.title }}{% endif %}</title>
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <meta name="description" content="Font Awesome, the iconic font designed for Bootstrap">
   <meta name="author" content="Dave Gandy">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <!--<meta name="viewport" content="initial-scale=1; maximum-scale=1">-->
+  <link rel="shortcut icon" href="{{ page.relative_path }}assets/ico/favicon.ico">
 
-  <!--[if lt IE 9]>
-  <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
-  <![endif]-->
+  <title>{% if page.title %}{{ page.title }}{% endif %}</title>
 
   <!-- CSS
- ================================================== -->
-
+  ================================================== -->
   <link rel="stylesheet" href="{{ page.relative_path }}assets/css/site.css">
   <link rel="stylesheet" href="{{ page.relative_path }}assets/css/pygments.css">
   <link rel="stylesheet" href="{{ page.relative_path }}assets/font-awesome/css/font-awesome.css">
-  <!--[if IE 7]>
-  <link rel="stylesheet" href="{{ page.relative_path }}assets/font-awesome/css/font-awesome-ie7.css">
+
+  <!--[if lt IE 9]>
+    <script src="{{ page.relative_path }}assets/js/html5shiv.js"></script>
+    <script src="{{ page.relative_path }}assets/js/respond.min.js"></script>
   <![endif]-->
-  <!-- Le fav and touch icons -->
-  <link rel="shortcut icon" href="{{ page.relative_path }}assets/ico/favicon.ico">
 
   <script type="text/javascript" src="//use.typekit.net/wnc7ioh.js"></script>
   <script type="text/javascript">try{Typekit.load();}catch(e){}</script>
@@ -45,19 +37,18 @@
     })();
   </script>
 </head>
-<body data-spy="scroll" data-target=".navbar">
-<div class="wrapper"> <!-- necessary for sticky footer. wrap all content except footer -->
+<body>
+<div id="wrap"> <!-- necessary for sticky footer. wrap all content except footer -->
   {% include navbar.html %}
 
   {{ content }}
-  <div class="push"><!-- necessary for sticky footer --></div>
 </div>
 {% include footer.html %}
 
 <script src="http://platform.twitter.com/widgets.js"></script>
-<script src="{{ page.relative_path }}assets/js/jquery-1.7.1.min.js"></script>
+<script src="{{ page.relative_path }}assets/js/jquery-{{ site.jquery.version }}.min.js"></script>
 <script src="{{ page.relative_path }}assets/js/ZeroClipboard-1.1.7.min.js"></script>
-<script src="{{ page.relative_path }}assets/js/bootstrap-2.3.1.min.js"></script>
+<script src="{{ page.relative_path }}assets/js/bootstrap-{{ site.bootstrap.version }}.min.js"></script>
 <script src="{{ page.relative_path }}assets/js/site.js"></script>
 
 </body>
diff --git a/bower_components/font-awesome/src/_layouts/icon.html b/bower_components/font-awesome/src/_layouts/icon.html
index 83723acd..6e5bf21c 100644
--- a/bower_components/font-awesome/src/_layouts/icon.html
+++ b/bower_components/font-awesome/src/_layouts/icon.html
@@ -6,19 +6,19 @@ relative_path: ../../
 <div class="jumbotron jumbotron-icon">
   <div class="container">
     <div class="info-icons">
-      <i class="icon-{{ page.icon.id }} icon-6"></i>&nbsp;&nbsp;
-      <span class="hidden-phone">
-        <i class="icon-{{ page.icon.id }} icon-5"></i>&nbsp;&nbsp;
-        <span class="hidden-tablet"><i class="icon-{{ page.icon.id }} icon-4"></i>&nbsp;&nbsp;</span>
-        <i class="icon-{{ page.icon.id }} icon-3"></i>&nbsp;&nbsp;
-        <i class="icon-{{ page.icon.id }} icon-2"></i>&nbsp;
+      <i class="fa fa-{{ page.icon.id }} fa-6"></i>&nbsp;&nbsp;
+      <span class="hide-xs">
+        <i class="fa fa-{{ page.icon.id }} fa-5"></i>&nbsp;&nbsp;
+        <span class="hide-sm"><i class="fa fa-{{ page.icon.id }} fa-4"></i>&nbsp;&nbsp;</span>
+        <i class="fa fa-{{ page.icon.id }} fa-3"></i>&nbsp;&nbsp;
+        <i class="fa fa-{{ page.icon.id }} fa-2"></i>&nbsp;
       </span>
-      <i class="icon-{{ page.icon.id }} icon-1"></i>
+      <i class="fa fa-{{ page.icon.id }} fa-1"></i>
     </div>
     <h1 class="info-class">
-      icon-{{ page.icon.id }}
+      fa-{{ page.icon.id }}
       <small>
-        <i class="icon-{{ page.icon.id }}"></i> &middot;
+        <i class="fa fa-{{ page.icon.id }}"></i> &middot;
         Unicode: <span class="upper">{{ page.icon.unicode }}</span> &middot;
         Created: v{{ page.icon.created }} &middot;
         Categories:
@@ -29,7 +29,7 @@ relative_path: ../../
         {% if icon_alias_count > 0 %}
           &middot; Aliases:
           {% for alias in page.icon.aliases %}
-            icon-{{ alias }}{% unless forloop.last %},{% endunless %}
+            fa-{{ alias }}{% unless forloop.last %},{% endunless %}
           {% endfor %}
         {% endif %}
       </small>
@@ -40,21 +40,21 @@ relative_path: ../../
 
 <div class="container">
   <section>
-    <div class="row-fluid">
-      <div class="span9">
-        <p>After you get <a href="{{ page.relative_path }}integration/">up and running</a>, you can place Font Awesome icons just about anywhere with the <code>&lt;i&gt;</code> tag:</p>
+    <div class="row">
+      <div class="col-md-9 col-sm-9">
+        <p>After you get <a href="{{ page.relative_path }}get-started/">up and running</a>, you can place Font Awesome icons just about anywhere with the <code>&lt;i&gt;</code> tag:</p>
         <div class="well well-transparent">
           <div style="font-size: 24px; line-height: 1.5em;">
-            <i class="icon-{{ page.icon.id }}"></i> icon-{{ page.icon.id }}
+            <i class="fa fa-{{ page.icon.id }}"></i> fa-{{ page.icon.id }}
           </div>
         </div>
 {% highlight html %}
-<i class="icon-{{ page.icon.id }}"></i> icon-{{ page.icon.id }}
+<i class="fa fa-{{ page.icon.id }}"></i> fa-{{ page.icon.id }}
 {% endhighlight %}
         <br>
-        <div class="lead"><i class="icon-info-sign"></i> Looking for more? Check out the <a href="{{ page.relative_path }}examples/">examples</a>.</div>
+        <div class="lead"><i class="fa fa-info-sign"></i> Looking for more? Check out the <a href="{{ page.relative_path }}examples/">examples</a>.</div>
       </div>
-      <div class="span3">
+      <div class="col-md-3 col-sm-3">
         <div class="info-ad">{% include ads/carbon-light-vertical.html %}</div>
       </div>
     </div>
author	Thomas Park <thomas@thomaspark.me>	2013-11-12 15:34:23 -0500
committer	Thomas Park <thomas@thomaspark.me>	2013-11-12 15:34:23 -0500
commit	016d9a2ae924c3999ff9aa279511e32c0bfbe7bb (patch)
tree	c04189b0eed7025a6764360cbe3613c900353fe6 /bower_components/font-awesome/src/_layouts
parent	61dab0661ba43d3192fa8c2945f7343df44049ed (diff)