Browse Source

replacing with new icon names

davegandy 11 years ago
parent
commit
3662998457

+ 3 - 2
css/font-awesome.css

@@ -330,10 +330,10 @@
 .fa-icon-download:before {
 .fa-icon-download:before {
   content: "\f019";
   content: "\f019";
 }
 }
-.fa-icon-arrow-down-circle-alt:before {
+.fa-icon-arrow-circle-alt-down:before {
   content: "\f01a";
   content: "\f01a";
 }
 }
-.fa-icon-arrow-up-circle-alt:before {
+.fa-icon-arrow-circle-alt-up:before {
   content: "\f01b";
   content: "\f01b";
 }
 }
 .fa-icon-inbox:before {
 .fa-icon-inbox:before {
@@ -869,6 +869,7 @@
 .fa-icon-undo:before {
 .fa-icon-undo:before {
   content: "\f0e2";
   content: "\f0e2";
 }
 }
+.fa-icon-legal:before,
 .fa-icon-gavel:before {
 .fa-icon-gavel:before {
   content: "\f0e3";
   content: "\f0e3";
 }
 }

+ 3 - 3
css/font-awesome.min.css

@@ -49,8 +49,8 @@
 .fa-icon-time:before{content:"\f017";}
 .fa-icon-time:before{content:"\f017";}
 .fa-icon-road:before{content:"\f018";}
 .fa-icon-road:before{content:"\f018";}
 .fa-icon-download:before{content:"\f019";}
 .fa-icon-download:before{content:"\f019";}
-.fa-icon-arrow-down-circle-alt:before{content:"\f01a";}
-.fa-icon-arrow-up-circle-alt:before{content:"\f01b";}
+.fa-icon-arrow-circle-alt-down:before{content:"\f01a";}
+.fa-icon-arrow-circle-alt-up:before{content:"\f01b";}
 .fa-icon-inbox:before{content:"\f01c";}
 .fa-icon-inbox:before{content:"\f01c";}
 .fa-icon-play-circle-alt:before{content:"\f01d";}
 .fa-icon-play-circle-alt:before{content:"\f01d";}
 .fa-icon-rotate-right:before,.fa-icon-repeat:before{content:"\f01e";}
 .fa-icon-rotate-right:before,.fa-icon-repeat:before{content:"\f01e";}
@@ -225,7 +225,7 @@
 .fa-icon-envelope:before{content:"\f0e0";}
 .fa-icon-envelope:before{content:"\f0e0";}
 .fa-icon-linkedin:before{content:"\f0e1";}
 .fa-icon-linkedin:before{content:"\f0e1";}
 .fa-icon-rotate-left:before,.fa-icon-undo:before{content:"\f0e2";}
 .fa-icon-rotate-left:before,.fa-icon-undo:before{content:"\f0e2";}
-.fa-icon-gavel:before{content:"\f0e3";}
+.fa-icon-legal:before,.fa-icon-gavel:before{content:"\f0e3";}
 .fa-icon-dashboard:before,.fa-icon-tachometer:before{content:"\f0e4";}
 .fa-icon-dashboard:before,.fa-icon-tachometer:before{content:"\f0e4";}
 .fa-icon-comment-alt:before{content:"\f0e5";}
 .fa-icon-comment-alt:before{content:"\f0e5";}
 .fa-icon-comments-alt:before{content:"\f0e6";}
 .fa-icon-comments-alt:before{content:"\f0e6";}

+ 3 - 2
less/icons.less

@@ -27,8 +27,8 @@
 .fa-icon-time:before { content: @time; }
 .fa-icon-time:before { content: @time; }
 .fa-icon-road:before { content: @road; }
 .fa-icon-road:before { content: @road; }
 .fa-icon-download:before { content: @download; }
 .fa-icon-download:before { content: @download; }
-.fa-icon-arrow-down-circle-alt:before { content: @arrow-down-circle-alt; }
-.fa-icon-arrow-up-circle-alt:before { content: @arrow-up-circle-alt; }
+.fa-icon-arrow-circle-alt-down:before { content: @arrow-circle-alt-down; }
+.fa-icon-arrow-circle-alt-up:before { content: @arrow-circle-alt-up; }
 .fa-icon-inbox:before { content: @inbox; }
 .fa-icon-inbox:before { content: @inbox; }
 .fa-icon-play-circle-alt:before { content: @play-circle-alt; }
 .fa-icon-play-circle-alt:before { content: @play-circle-alt; }
 .fa-icon-rotate-right:before,
 .fa-icon-rotate-right:before,
@@ -214,6 +214,7 @@
 .fa-icon-linkedin:before { content: @linkedin; }
 .fa-icon-linkedin:before { content: @linkedin; }
 .fa-icon-rotate-left:before,
 .fa-icon-rotate-left:before,
 .fa-icon-undo:before { content: @undo; }
 .fa-icon-undo:before { content: @undo; }
+.fa-icon-legal:before,
 .fa-icon-gavel:before { content: @gavel; }
 .fa-icon-gavel:before { content: @gavel; }
 .fa-icon-dashboard:before,
 .fa-icon-dashboard:before,
 .fa-icon-tachometer:before { content: @tachometer; }
 .fa-icon-tachometer:before { content: @tachometer; }

+ 2 - 2
less/variables.less

@@ -35,8 +35,8 @@
 @time: "\f017";
 @time: "\f017";
 @road: "\f018";
 @road: "\f018";
 @download: "\f019";
 @download: "\f019";
-@arrow-down-circle-alt: "\f01a";
-@arrow-up-circle-alt: "\f01b";
+@arrow-circle-alt-down: "\f01a";
+@arrow-circle-alt-up: "\f01b";
 @inbox: "\f01c";
 @inbox: "\f01c";
 @play-circle-alt: "\f01d";
 @play-circle-alt: "\f01d";
 @repeat: "\f01e";
 @repeat: "\f01e";

+ 3 - 2
scss/_icons.scss

@@ -27,8 +27,8 @@
 .icon-time:before { content: $time; }
 .icon-time:before { content: $time; }
 .icon-road:before { content: $road; }
 .icon-road:before { content: $road; }
 .icon-download:before { content: $download; }
 .icon-download:before { content: $download; }
-.icon-arrow-down-circle-alt:before { content: $arrow-down-circle-alt; }
-.icon-arrow-up-circle-alt:before { content: $arrow-up-circle-alt; }
+.icon-arrow-circle-alt-down:before { content: $arrow-circle-alt-down; }
+.icon-arrow-circle-alt-up:before { content: $arrow-circle-alt-up; }
 .icon-inbox:before { content: $inbox; }
 .icon-inbox:before { content: $inbox; }
 .icon-play-circle-alt:before { content: $play-circle-alt; }
 .icon-play-circle-alt:before { content: $play-circle-alt; }
 .icon-rotate-right:before,
 .icon-rotate-right:before,
@@ -214,6 +214,7 @@
 .icon-linkedin:before { content: $linkedin; }
 .icon-linkedin:before { content: $linkedin; }
 .icon-rotate-left:before,
 .icon-rotate-left:before,
 .icon-undo:before { content: $undo; }
 .icon-undo:before { content: $undo; }
+.icon-legal:before,
 .icon-gavel:before { content: $gavel; }
 .icon-gavel:before { content: $gavel; }
 .icon-dashboard:before,
 .icon-dashboard:before,
 .icon-tachometer:before { content: $tachometer; }
 .icon-tachometer:before { content: $tachometer; }

+ 2 - 2
scss/_variables.scss

@@ -60,9 +60,9 @@ $road: "\f018";
 
 
 $download: "\f019";
 $download: "\f019";
 
 
-$arrow-down-circle-alt: "\f01a";
+$arrow-circle-alt-down: "\f01a";
 
 
-$arrow-up-circle-alt: "\f01b";
+$arrow-circle-alt-up: "\f01b";
 
 
 $inbox: "\f01c";
 $inbox: "\f01c";
 
 

+ 1 - 1
src/_includes/examples/animated-spinner.html

@@ -13,7 +13,7 @@
 <i class="fa-icon fa-icon-spinner fa-icon-spin fa-icon-lg"></i> Spinner icon when loading content...
 <i class="fa-icon fa-icon-spinner fa-icon-spin fa-icon-lg"></i> Spinner icon when loading content...
 {% endhighlight %}
 {% endhighlight %}
       <p class="alert alert-info">
       <p class="alert alert-info">
-        <i class="fa-icon fa-icon-info-sign"></i> CSS3 animations aren't supported in IE8 - IE9.
+        <i class="fa-icon fa-icon-info-circle"></i> CSS3 animations aren't supported in IE8 - IE9.
       </p>
       </p>
     </div>
     </div>
   </div>
   </div>

+ 3 - 3
src/_includes/examples/button-dropdowns.html

@@ -9,7 +9,7 @@
         <ul class="dropdown-menu">
         <ul class="dropdown-menu">
           <li><a href="#"><i class="fa-icon fa-icon-pencil fa-icon-fixed-width"></i> Edit</a></li>
           <li><a href="#"><i class="fa-icon fa-icon-pencil fa-icon-fixed-width"></i> Edit</a></li>
           <li><a href="#"><i class="fa-icon fa-icon-trash fa-icon-fixed-width"></i> Delete</a></li>
           <li><a href="#"><i class="fa-icon fa-icon-trash fa-icon-fixed-width"></i> Delete</a></li>
-          <li><a href="#"><i class="fa-icon fa-icon-ban-circle fa-icon-fixed-width"></i> Ban</a></li>
+          <li><a href="#"><i class="fa-icon fa-icon-ban fa-icon-fixed-width"></i> Ban</a></li>
           <li class="divider"></li>
           <li class="divider"></li>
           <li><a href="#"><i class="i"></i> Make admin</a></li>
           <li><a href="#"><i class="i"></i> Make admin</a></li>
         </ul>
         </ul>
@@ -24,13 +24,13 @@
   <ul class="dropdown-menu">
   <ul class="dropdown-menu">
     <li><a href="#"><i class="fa-icon fa-icon-pencil fa-icon-fixed-width"></i> Edit</a></li>
     <li><a href="#"><i class="fa-icon fa-icon-pencil fa-icon-fixed-width"></i> Edit</a></li>
     <li><a href="#"><i class="fa-icon fa-icon-trash fa-icon-fixed-width"></i> Delete</a></li>
     <li><a href="#"><i class="fa-icon fa-icon-trash fa-icon-fixed-width"></i> Delete</a></li>
-    <li><a href="#"><i class="fa-icon fa-icon-ban-circle fa-icon-fixed-width"></i> Ban</a></li>
+    <li><a href="#"><i class="fa-icon fa-icon-ban fa-icon-fixed-width"></i> Ban</a></li>
     <li class="divider"></li>
     <li class="divider"></li>
     <li><a href="#"><i class="i"></i> Make admin</a></li>
     <li><a href="#"><i class="i"></i> Make admin</a></li>
   </ul>
   </ul>
 </div>
 </div>
 {% endhighlight %}
 {% endhighlight %}
-      <div class="alert alert-info"><i class="fa-icon fa-icon-info-sign"></i> Don't forget to add the appropriate JavaScript to enable button dropdowns.</div>
+      <div class="alert alert-info"><i class="fa-icon fa-icon-info-circle"></i> Don't forget to add the appropriate JavaScript to enable button dropdowns.</div>
     </div>
     </div>
   </div>
   </div>
 </section>
 </section>

+ 2 - 2
src/_includes/examples/buttons.html

@@ -12,7 +12,7 @@
         <a class="btn btn-large btn-primary" href="#">
         <a class="btn btn-large btn-primary" href="#">
           <i class="fa-icon fa-icon-comment"></i> Comment</a>
           <i class="fa-icon fa-icon-comment"></i> Comment</a>
         <a class="btn btn-sm btn-info" href="#">
         <a class="btn btn-sm btn-info" href="#">
-          <i class="fa-icon fa-icon-info-sign"></i> Info</a>
+          <i class="fa-icon fa-icon-info-circle"></i> Info</a>
       </p>
       </p>
       <p>
       <p>
         <a class="btn btn-danger" href="#">
         <a class="btn btn-danger" href="#">
@@ -42,7 +42,7 @@
 <a class="btn btn-lg btn-primary" href="#">
 <a class="btn btn-lg btn-primary" href="#">
   <i class="fa-icon fa-icon-comment"></i> Comment</a>
   <i class="fa-icon fa-icon-comment"></i> Comment</a>
 <a class="btn btn-sm btn-info" href="#">
 <a class="btn btn-sm btn-info" href="#">
-  <i class="fa-icon fa-icon-info-sign"></i> Info</a>
+  <i class="fa-icon fa-icon-info-circle"></i> Info</a>
 <a class="btn btn-danger" href="#">
 <a class="btn btn-danger" href="#">
   <i class="fa-icon fa-icon-trash fa-icon-lg"></i> Delete</a>
   <i class="fa-icon fa-icon-trash fa-icon-lg"></i> Delete</a>
 <a class="btn btn-default btn-sm" href="#">
 <a class="btn btn-default btn-sm" href="#">

+ 2 - 2
src/_includes/examples/form-inputs.html

@@ -3,7 +3,7 @@
   <div class="row">
   <div class="row">
     <div class="col-md-3 col-sm-4">
     <div class="col-md-3 col-sm-4">
       <div class="input-group">
       <div class="input-group">
-        <span class="input-group-addon"><i class="fa-icon fa-icon-envelope"></i></span>
+        <span class="input-group-addon"><i class="fa-icon fa-icon-envelope-alt"></i></span>
         <input class="form-control" type="text" placeholder="Email address">
         <input class="form-control" type="text" placeholder="Email address">
       </div>
       </div>
       <br>
       <br>
@@ -16,7 +16,7 @@
 {% highlight html %}
 {% highlight html %}
 <form>
 <form>
   <div class="input-prepend">
   <div class="input-prepend">
-    <span class="add-on"><i class="fa-icon fa-icon-envelope"></i></span>
+    <span class="add-on"><i class="fa-icon fa-icon-envelope-alt"></i></span>
     <input class="span2" type="text" placeholder="Email address">
     <input class="span2" type="text" placeholder="Email address">
   </div>
   </div>
   <div class="input-prepend">
   <div class="input-prepend">

+ 1 - 1
src/_includes/examples/inline-icons.html

@@ -13,7 +13,7 @@
 {% highlight html %}
 {% highlight html %}
 <i class="fa-icon fa-icon-camera-retro"></i> icon-camera-retro
 <i class="fa-icon fa-icon-camera-retro"></i> icon-camera-retro
 {% endhighlight %}
 {% endhighlight %}
-      <div class="alert alert-info"><i class="fa-icon fa-icon-info-sign"></i> Icon classes are echoed via CSS :before.</div>
+      <div class="alert alert-info"><i class="fa-icon fa-icon-info-circle"></i> Icon classes are echoed via CSS :before.</div>
     </div>
     </div>
   </div>
   </div>
 </section>
 </section>

+ 1 - 1
src/_includes/examples/larger-icons.html

@@ -27,7 +27,7 @@
 <p><i class="fa-icon fa-icon-camera-retro fa-icon-4x"></i> fa-icon-camera-retro</p>
 <p><i class="fa-icon fa-icon-camera-retro fa-icon-4x"></i> fa-icon-camera-retro</p>
 {% endhighlight %}
 {% endhighlight %}
       <div class="alert alert-info">
       <div class="alert alert-info">
-        <i class="fa-icon fa-icon-info-sign"></i> If your icons are getting chopped off on top and bottom, make sure you have
+        <i class="fa-icon fa-icon-info-circle"></i> If your icons are getting chopped off on top and bottom, make sure you have
         sufficient line-height.
         sufficient line-height.
       </div>
       </div>
     </div>
     </div>

+ 13 - 13
src/_includes/examples/list-bullets.html

@@ -3,27 +3,27 @@
   <div class="row">
   <div class="row">
     <div class="col-md-3 col-sm-4">
     <div class="col-md-3 col-sm-4">
       <ul class="fa-icon-ul">
       <ul class="fa-icon-ul">
-        <li><i class="fa-icon-li fa-icon fa-icon-ok"></i>List bullets (like these)</li>
-        <li><i class="fa-icon-li fa-icon fa-icon-ok"></i>Buttons</li>
-        <li><i class="fa-icon-li fa-icon fa-icon-ok"></i>Button groups</li>
-        <li><i class="fa-icon-li fa-icon fa-icon-ok"></i>Navigation</li>
-        <li><i class="fa-icon-li fa-icon fa-icon-ok"></i>Prepended form inputs</li>
-        <li><i class="fa-icon-li fa-icon fa-icon-ok"></i>&hellip;and many more with custom CSS</li>
+        <li><i class="fa-icon-li fa-icon fa-icon-check"></i>List bullets (like these)</li>
+        <li><i class="fa-icon-li fa-icon fa-icon-check"></i>Buttons</li>
+        <li><i class="fa-icon-li fa-icon fa-icon-check"></i>Button groups</li>
+        <li><i class="fa-icon-li fa-icon fa-icon-check"></i>Navigation</li>
+        <li><i class="fa-icon-li fa-icon fa-icon-check"></i>Prepended form inputs</li>
+        <li><i class="fa-icon-li fa-icon fa-icon-check"></i>&hellip;and many more with custom CSS</li>
       </ul>
       </ul>
     </div>
     </div>
     <div class="col-md-9 col-sm-8">
     <div class="col-md-9 col-sm-8">
       <p>Easily replace individual list bullets.</p>
       <p>Easily replace individual list bullets.</p>
 {% highlight html %}
 {% highlight html %}
 <ul class="fa-icon-ul">
 <ul class="fa-icon-ul">
-  <li><i class="fa-icon-li fa-icon fa-icon-ok"></i>Bulleted lists (like this one)</li>
-  <li><i class="fa-icon-li fa-icon fa-icon-ok"></i>Buttons</li>
-  <li><i class="fa-icon-li fa-icon fa-icon-ok"></i>Button groups</li>
-  <li><i class="fa-icon-li fa-icon fa-icon-ok"></i>Navigation</li>
-  <li><i class="fa-icon-li fa-icon fa-icon-ok"></i>Prepended form inputs</li>
-  <li><i class="fa-icon-li fa-icon fa-icon-ok"></i>&hellip;and many more with custom CSS</li>
+  <li><i class="fa-icon-li fa-icon fa-icon-check"></i>Bulleted lists (like this one)</li>
+  <li><i class="fa-icon-li fa-icon fa-icon-check"></i>Buttons</li>
+  <li><i class="fa-icon-li fa-icon fa-icon-check"></i>Button groups</li>
+  <li><i class="fa-icon-li fa-icon fa-icon-check"></i>Navigation</li>
+  <li><i class="fa-icon-li fa-icon fa-icon-check"></i>Prepended form inputs</li>
+  <li><i class="fa-icon-li fa-icon fa-icon-check"></i>&hellip;and many more with custom CSS</li>
 </ul>
 </ul>
 {% endhighlight %}
 {% endhighlight %}
-      <div class="alert alert-info"><i class="fa-icon fa-icon-info-sign"></i> Make sure to NOT include any whitespace after the icon declaration.</div>
+      <div class="alert alert-info"><i class="fa-icon fa-icon-info-circle"></i> Make sure to NOT include any whitespace after the icon declaration.</div>
     </div>
     </div>
   </div>
   </div>
 </section>
 </section>

+ 8 - 8
src/_includes/examples/new.html

@@ -20,22 +20,22 @@
             <i class="fa-icon fa-icon-unchecked fa-icon-stack-base"></i>
             <i class="fa-icon fa-icon-unchecked fa-icon-stack-base"></i>
             <i class="fa-icon fa-icon-twitter"></i>
             <i class="fa-icon fa-icon-twitter"></i>
           </span>
           </span>
-          fa-icon-twitter on fa-icon-check-empty<br>
+          fa-icon-twitter on fa-icon-unchecked<br>
           <span class="fa-icon-stack">
           <span class="fa-icon-stack">
             <i class="fa-icon fa-icon-circle fa-icon-stack-base"></i>
             <i class="fa-icon fa-icon-circle fa-icon-stack-base"></i>
             <i class="fa-icon fa-icon-flag fa-icon-light"></i>
             <i class="fa-icon fa-icon-flag fa-icon-light"></i>
           </span>
           </span>
           fa-icon-flag on fa-icon-circle<br>
           fa-icon-flag on fa-icon-circle<br>
           <span class="fa-icon-stack">
           <span class="fa-icon-stack">
-            <i class="fa-icon fa-icon-sign-blank fa-icon-stack-base"></i>
+            <i class="fa-icon fa-icon-square fa-icon-stack-base"></i>
             <i class="fa-icon fa-icon-terminal fa-icon-light"></i>
             <i class="fa-icon fa-icon-terminal fa-icon-light"></i>
           </span>
           </span>
-          fa-icon-terminal on fa-icon-sign-blank<br>
+          fa-icon-terminal on fa-icon-square<br>
           <span class="fa-icon-stack">
           <span class="fa-icon-stack">
             <i class="fa-icon fa-icon-camera"></i>
             <i class="fa-icon fa-icon-camera"></i>
-            <i class="fa-icon fa-icon-ban-circle fa-icon-stack-base text-danger"></i>
+            <i class="fa-icon fa-icon-ban fa-icon-stack-base text-danger"></i>
           </span>
           </span>
-          fa-icon-camera on fa-icon-ban-circle
+          fa-icon-camera on fa-icon-ban
       </div>
       </div>
       </div>
       </div>
     </div>
     </div>
@@ -43,10 +43,10 @@
       <h4><a href="#bulleted-lists">Better Bulleted Lists</a></h4>
       <h4><a href="#bulleted-lists">Better Bulleted Lists</a></h4>
       <div class="well well-transparent">
       <div class="well well-transparent">
         <ul class="fa-icon-ul">
         <ul class="fa-icon-ul">
-          <li><i class="fa-icon fa-icon-li fa-icon-chevron-sign-right"></i>New bulleted lists</li>
+          <li><i class="fa-icon fa-icon-li fa-icon-chevron-circle-right"></i>New bulleted lists</li>
           <li><i class="fa-icon fa-icon-li fa-icon-bullseye"></i>Fix some old bugs</li>
           <li><i class="fa-icon fa-icon-li fa-icon-bullseye"></i>Fix some old bugs</li>
-          <li><i class="fa-icon fa-icon-li fa-icon-play-sign"></i>And deal with arbitrary</li>
-          <li><i class="fa-icon fa-icon-li fa-icon-ok-sign"></i>Font sizes better</li>
+          <li><i class="fa-icon fa-icon-li fa-icon-play-circle"></i>And deal with arbitrary</li>
+          <li><i class="fa-icon fa-icon-li fa-icon-check-circle"></i>Font sizes better</li>
         </ul>
         </ul>
       </div>
       </div>
     </div>
     </div>

+ 1 - 1
src/_includes/examples/rotated-flipped.html

@@ -22,7 +22,7 @@
 <i class="fa-icon fa-icon-shield fa-icon-flip-vertical"></i>&nbsp; icon-flip-vertical
 <i class="fa-icon fa-icon-shield fa-icon-flip-vertical"></i>&nbsp; icon-flip-vertical
 {% endhighlight %}
 {% endhighlight %}
       <p class="alert alert-info">
       <p class="alert alert-info">
-        <i class="fa-icon fa-icon-info-sign"></i> Rotating and flipping icons aren't yet supported in IE7.
+        <i class="fa-icon fa-icon-info-circle"></i> Rotating and flipping icons aren't yet supported in IE7.
       </p>
       </p>
     </div>
     </div>
   </div>
   </div>

+ 4 - 4
src/_includes/examples/stacked.html

@@ -18,15 +18,15 @@
         </span>
         </span>
         fa-icon-flag on fa-icon-circle<br>
         fa-icon-flag on fa-icon-circle<br>
         <span class="fa-icon-stack">
         <span class="fa-icon-stack">
-          <i class="fa-icon fa-icon-sign-blank fa-icon-stack-base"></i>
+          <i class="fa-icon fa-icon-square fa-icon-stack-base"></i>
           <i class="fa-icon fa-icon-terminal fa-icon-light"></i>
           <i class="fa-icon fa-icon-terminal fa-icon-light"></i>
         </span>
         </span>
-        fa-icon-terminal on fa-icon-sign-blank<br>
+        fa-icon-terminal on fa-icon-square<br>
         <span class="fa-icon-stack">
         <span class="fa-icon-stack">
           <i class="fa-icon fa-icon-camera"></i>
           <i class="fa-icon fa-icon-camera"></i>
-          <i class="fa-icon fa-icon-ban-circle fa-icon-stack-base text-danger"></i>
+          <i class="fa-icon fa-icon-ban fa-icon-stack-base text-danger"></i>
         </span>
         </span>
-        fa-icon-camera on fa-icon-ban-circle
+        fa-icon-camera on fa-icon-ban
       </div>
       </div>
 {% highlight html %}
 {% highlight html %}
 <span class="fa-icon-stack">
 <span class="fa-icon-stack">

+ 2 - 2
src/_includes/get-started.html

@@ -18,7 +18,7 @@
 <link href="//netdna.bootstrapcdn.com/font-awesome/{{ site.fontawesome.version }}/css/font-awesome.css" rel="stylesheet">
 <link href="//netdna.bootstrapcdn.com/font-awesome/{{ site.fontawesome.version }}/css/font-awesome.css" rel="stylesheet">
 {% endhighlight %}
 {% endhighlight %}
       <div class="alert alert-info margin-top">
       <div class="alert alert-info margin-top">
-        <i class="fa-icon fa-icon-info-sign"></i> Want to use Font Awesome by itself without Bootstrap? Just don't include the first line.
+        <i class="fa-icon fa-icon-info-circle"></i> Want to use Font Awesome by itself without Bootstrap? Just don't include the first line.
       </div>
       </div>
     </li>
     </li>
     <li>
     <li>
@@ -66,7 +66,7 @@
 {% highlight html %}
 {% highlight html %}
 @FontAwesomePath:   "../font";
 @FontAwesomePath:   "../font";
 {% endhighlight %}
 {% endhighlight %}
-      <p class="alert alert-info"><i class="fa-icon fa-icon-info-sign"></i> The font path is relative from your compiled CSS directory.</p>
+      <p class="alert alert-info"><i class="fa-icon fa-icon-info-circle"></i> The font path is relative from your compiled CSS directory.</p>
     </li>
     </li>
     <li>Re-compile your LESS if using a static compiler. Otherwise, you should be good to go.</li>
     <li>Re-compile your LESS if using a static compiler. Otherwise, you should be good to go.</li>
     <li>Check out the <a href="{{ page.relative_path }}examples/">examples</a> to start using Font Awesome!</li>
     <li>Check out the <a href="{{ page.relative_path }}examples/">examples</a> to start using Font Awesome!</li>

+ 3 - 3
src/_includes/jumbotron-carousel.html

@@ -7,7 +7,7 @@
         <div class="actions">
         <div class="actions">
           <a class="btn btn-default btn-lg" href="{{ page.relative_path }}assets/font-awesome.zip"
           <a class="btn btn-default btn-lg" href="{{ page.relative_path }}assets/font-awesome.zip"
              onClick="_gaq.push(['_trackEvent', 'Outbound Link', 'Download on GitHub']);">
              onClick="_gaq.push(['_trackEvent', 'Outbound Link', 'Download on GitHub']);">
-            <i class="fa-icon fa-icon-download-alt fa-icon-lg"></i>&nbsp;&nbsp;
+            <i class="fa-icon fa-icon-download fa-icon-lg"></i>&nbsp;&nbsp;
             Download
             Download
           </a>
           </a>
         </div>
         </div>
@@ -39,10 +39,10 @@
           <!-- Carousel nav -->
           <!-- Carousel nav -->
           <a class="carousel-control left" href="#icon-carousel" data-slide="prev"
           <a class="carousel-control left" href="#icon-carousel" data-slide="prev"
              onClick="_gaq.push(['_trackEvent', 'iconCarousel', 'Prev']);">
              onClick="_gaq.push(['_trackEvent', 'iconCarousel', 'Prev']);">
-            <i class="fa-icon fa-icon-circle-arrow-left"></i></a>
+            <i class="fa-icon fa-icon-arrow-circle-left"></i></a>
           <a class="carousel-control right" href="#icon-carousel" data-slide="next"
           <a class="carousel-control right" href="#icon-carousel" data-slide="next"
              onClick="_gaq.push(['_trackEvent', 'iconCarousel', 'Next']);">
              onClick="_gaq.push(['_trackEvent', 'iconCarousel', 'Next']);">
-            <i class="fa-icon fa-icon-circle-arrow-right"></i></a>
+            <i class="fa-icon fa-icon-arrow-circle-right"></i></a>
         </div>
         </div>
       </div>
       </div>
     </div>
     </div>

+ 1 - 1
src/_includes/license.html

@@ -10,7 +10,7 @@
   <div class="alert alert-info">
   <div class="alert alert-info">
     <ul class="fa-icon-ul margin-bottom-none">
     <ul class="fa-icon-ul margin-bottom-none">
       <li>
       <li>
-        <i class="fa-icon-li fa-icon fa-icon-info-sign fa-icon-lg"></i>Attribution is no longer required as of Font Awesome 3.0 but is much appreciated:
+        <i class="fa-icon-li fa-icon fa-icon-info-circle fa-icon-lg"></i>Attribution is no longer required as of Font Awesome 3.0 but is much appreciated:
         "Font Awesome by Dave Gandy - http://fontawesome.io".
         "Font Awesome by Dave Gandy - http://fontawesome.io".
       </li>
       </li>
     </ul>
     </ul>

+ 1 - 1
src/_includes/navbar.html

@@ -27,7 +27,7 @@
             <li><a href="{{ page.relative_path }}icons/#currency"><i class="fa-icon fa-icon-won fa-icon-fixed-width"></i>&nbsp; Currency Icons</a></li>
             <li><a href="{{ page.relative_path }}icons/#currency"><i class="fa-icon fa-icon-won fa-icon-fixed-width"></i>&nbsp; Currency Icons</a></li>
             <li><a href="{{ page.relative_path }}icons/#text-editor"><i class="fa-icon fa-icon-file-text-alt fa-icon-fixed-width"></i>&nbsp; Text Editor Icons</a></li>
             <li><a href="{{ page.relative_path }}icons/#text-editor"><i class="fa-icon fa-icon-file-text-alt fa-icon-fixed-width"></i>&nbsp; Text Editor Icons</a></li>
             <li><a href="{{ page.relative_path }}icons/#directional"><i class="fa-icon fa-icon-hand-right fa-icon-fixed-width"></i>&nbsp; Directional Icons</a></li>
             <li><a href="{{ page.relative_path }}icons/#directional"><i class="fa-icon fa-icon-hand-right fa-icon-fixed-width"></i>&nbsp; Directional Icons</a></li>
-            <li><a href="{{ page.relative_path }}icons/#video-player"><i class="fa-icon fa-icon-play-sign fa-icon-fixed-width"></i>&nbsp; Video Player Icons</a></li>
+            <li><a href="{{ page.relative_path }}icons/#video-player"><i class="fa-icon fa-icon-play-circle fa-icon-fixed-width"></i>&nbsp; Video Player Icons</a></li>
             <li><a href="{{ page.relative_path }}icons/#brand"><i class="fa-icon fa-icon-github fa-icon-fixed-width"></i>&nbsp; Brand Icons</a></li>
             <li><a href="{{ page.relative_path }}icons/#brand"><i class="fa-icon fa-icon-github fa-icon-fixed-width"></i>&nbsp; Brand Icons</a></li>
             <li><a href="{{ page.relative_path }}icons/#medical"><i class="fa-icon fa-icon-medkit fa-icon-fixed-width"></i>&nbsp; Medical Icons</a></li>
             <li><a href="{{ page.relative_path }}icons/#medical"><i class="fa-icon fa-icon-medkit fa-icon-fixed-width"></i>&nbsp; Medical Icons</a></li>
           </ul>
           </ul>

+ 6 - 6
src/_includes/tests/stacked-inside-anchor.html

@@ -1,21 +1,21 @@
 <p>
 <p>
   <a href="#">
   <a href="#">
     <span class="fa-icon-stack">
     <span class="fa-icon-stack">
-      <i class="fa-icon fa-icon-sign-blank fa-icon-stack-base"></i>
+      <i class="fa-icon fa-icon-square fa-icon-stack-base"></i>
       <i class="fa-icon fa-icon-twitter fa-icon-light"></i>
       <i class="fa-icon fa-icon-twitter fa-icon-light"></i>
     </span>
     </span>
     Twitter Icon
     Twitter Icon
   </a>
   </a>
   <a href="#">
   <a href="#">
     <span class="fa-icon-stack">
     <span class="fa-icon-stack">
-      <i class="fa-icon fa-icon-sign-blank fa-icon-stack-base"></i>
+      <i class="fa-icon fa-icon-square fa-icon-stack-base"></i>
       <i class="fa-icon fa-icon-facebook fa-icon-light"></i>
       <i class="fa-icon fa-icon-facebook fa-icon-light"></i>
     </span>
     </span>
     Facebook Icon
     Facebook Icon
   </a>
   </a>
   <a href="#">
   <a href="#">
     <span class="fa-icon-stack">
     <span class="fa-icon-stack">
-      <i class="fa-icon fa-icon-sign-blank fa-icon-stack-base"></i>
+      <i class="fa-icon fa-icon-square fa-icon-stack-base"></i>
       <i class="fa-icon fa-icon-github fa-icon-light"></i>
       <i class="fa-icon fa-icon-github fa-icon-light"></i>
     </span>
     </span>
     GitHub Icon
     GitHub Icon
@@ -47,21 +47,21 @@
 <p>
 <p>
   <a href="#">
   <a href="#">
     <span class="fa-icon-stack">
     <span class="fa-icon-stack">
-      <i class="fa-icon fa-icon-circle-blank fa-icon-stack-base"></i>
+      <i class="fa-icon fa-icon-circle-alt fa-icon-stack-base"></i>
       <i class="fa-icon fa-icon-twitter"></i>
       <i class="fa-icon fa-icon-twitter"></i>
     </span>
     </span>
     Twitter Icon
     Twitter Icon
   </a>
   </a>
   <a href="#">
   <a href="#">
     <span class="fa-icon-stack">
     <span class="fa-icon-stack">
-      <i class="fa-icon fa-icon-circle-blank fa-icon-stack-base"></i>
+      <i class="fa-icon fa-icon-circle-alt fa-icon-stack-base"></i>
       <i class="fa-icon fa-icon-facebook"></i>
       <i class="fa-icon fa-icon-facebook"></i>
     </span>
     </span>
     Facebook Icon
     Facebook Icon
   </a>
   </a>
   <a href="#">
   <a href="#">
     <span class="fa-icon-stack">
     <span class="fa-icon-stack">
-      <i class="fa-icon fa-icon-circle-blank fa-icon-stack-base"></i>
+      <i class="fa-icon fa-icon-circle-alt fa-icon-stack-base"></i>
       <i class="fa-icon fa-icon-github"></i>
       <i class="fa-icon fa-icon-github"></i>
     </span>
     </span>
     GitHub Icon
     GitHub Icon

+ 2 - 2
src/_includes/whats-new.html

@@ -18,7 +18,7 @@
       A long term solution is now in place for SCSS support. Need SASS? Try <a href="http://sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#syntax">sass-convert</a>.
       A long term solution is now in place for SCSS support. Need SASS? Try <a href="http://sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#syntax">sass-convert</a>.
     </div>
     </div>
     <div class="col-md-4 col-sm-6">
     <div class="col-md-4 col-sm-6">
-      <h4><i class="fa-icon fa-icon-legal"></i> <a href="{{ page.relative_path }}license/">Better & Simpler License</a></h4>
+      <h4><i class="fa-icon fa-icon-gavel"></i> <a href="{{ page.relative_path }}license/">Better & Simpler License</a></h4>
       SIL OFL 1.1 for font, MIT license for code. No more attribution required, but much appreciated.
       SIL OFL 1.1 for font, MIT license for code. No more attribution required, but much appreciated.
     </div>
     </div>
     <div class="col-md-4 col-sm-6">
     <div class="col-md-4 col-sm-6">
@@ -30,7 +30,7 @@
       Thanks to <a href="https://twitter.com/grantgordon">@grantgordon</a> and <a href="https://twitter.com/johnsmclay">@johnsmclay</a>, you can <a href="http://icnfnt.com/">subset</a> to get just the icons you need.
       Thanks to <a href="https://twitter.com/grantgordon">@grantgordon</a> and <a href="https://twitter.com/johnsmclay">@johnsmclay</a>, you can <a href="http://icnfnt.com/">subset</a> to get just the icons you need.
     </div>
     </div>
     <div class="col-md-4 col-sm-6">
     <div class="col-md-4 col-sm-6">
-      <h4><i class="fa-icon fa-icon-question-sign"></i> Want More Details?</h4>
+      <h4><i class="fa-icon fa-icon-question-circle"></i> Want More Details?</h4>
       Check out the <a href="{{ site.fontawesome.github.url }}#changelog">CHANGELOG on the GitHub project</a> to see
       Check out the <a href="{{ site.fontawesome.github.url }}#changelog">CHANGELOG on the GitHub project</a> to see
       what's new and changed.
       what's new and changed.
     </div>
     </div>

+ 2 - 2
src/_includes/why.html

@@ -17,11 +17,11 @@
       Font Awesome is completely free for commercial use. Check out the <a href="{{ page.relative_path }}license/">license</a>.
       Font Awesome is completely free for commercial use. Check out the <a href="{{ page.relative_path }}license/">license</a>.
     </div>
     </div>
     <div class="col-md-4 col-sm-6">
     <div class="col-md-4 col-sm-6">
-      <h4><i class="fa-icon fa-icon-ok"></i> IE7 Support</h4>
+      <h4><i class="fa-icon fa-icon-check"></i> IE7 Support</h4>
       Font Awesome supports IE7. If you need it, you have my condolences.
       Font Awesome supports IE7. If you need it, you have my condolences.
     </div>
     </div>
     <div class="col-md-4 col-sm-6">
     <div class="col-md-4 col-sm-6">
-      <h4><i class="fa-icon fa-icon-eye-open"></i> Perfect on Retina Displays</h4>
+      <h4><i class="fa-icon fa-icon-eye"></i> Perfect on Retina Displays</h4>
       Font Awesome icons are vectors, which mean they're gorgeous on high-resolution displays.
       Font Awesome icons are vectors, which mean they're gorgeous on high-resolution displays.
     </div>
     </div>
     <div class="col-md-4 col-sm-6">
     <div class="col-md-4 col-sm-6">

+ 6 - 4
src/icons.yml

@@ -177,15 +177,15 @@ icons:
     categories:
     categories:
       - Web Application Icons
       - Web Application Icons
 
 
-  - name:       Arrow Down Circle Alt
-    id:         arrow-down-circle-alt
+  - name:       Arrow Circle Alt Down
+    id:         arrow-circle-alt-down
     unicode:    f01a
     unicode:    f01a
     created:    1.0
     created:    1.0
     categories:
     categories:
       - Web Application Icons
       - Web Application Icons
 
 
-  - name:       Arrow Up Circle Alt
-    id:         arrow-up-circle-alt
+  - name:       Arrow Circle Alt Up
+    id:         arrow-circle-alt-up
     unicode:    f01b
     unicode:    f01b
     created:    1.0
     created:    1.0
     categories:
     categories:
@@ -1450,6 +1450,8 @@ icons:
     id:         gavel
     id:         gavel
     unicode:    f0e3
     unicode:    f0e3
     created:    2.0
     created:    2.0
+    aliases:
+      - legal
     categories:
     categories:
       - Web Application Icons
       - Web Application Icons
 
 

+ 1 - 1
src/license.html

@@ -4,7 +4,7 @@ title: Font Awesome License
 navbar_active: license
 navbar_active: license
 relative_path: ../
 relative_path: ../
 ---
 ---
-{% capture jumbotron_h1 %}<i class="fa-icon fa-icon-legal"></i>&nbsp; License{% endcapture %}
+{% capture jumbotron_h1 %}<i class="fa-icon fa-icon-gavel"></i>&nbsp; License{% endcapture %}
 {% capture jumbotron_p %}The full details of how Font Awesome is licensed{% endcapture %}
 {% capture jumbotron_p %}The full details of how Font Awesome is licensed{% endcapture %}
 
 
 {% include jumbotron.html %}
 {% include jumbotron.html %}