diff --git a/css/font-awesome.css b/css/font-awesome.css index 320ab9f94..c2630800c 100644 --- a/css/font-awesome.css +++ b/css/font-awesome.css @@ -330,10 +330,10 @@ .fa-icon-download:before { content: "\f019"; } -.fa-icon-arrow-down-circle-alt:before { +.fa-icon-arrow-circle-alt-down:before { content: "\f01a"; } -.fa-icon-arrow-up-circle-alt:before { +.fa-icon-arrow-circle-alt-up:before { content: "\f01b"; } .fa-icon-inbox:before { @@ -869,6 +869,7 @@ .fa-icon-undo:before { content: "\f0e2"; } +.fa-icon-legal:before, .fa-icon-gavel:before { content: "\f0e3"; } diff --git a/css/font-awesome.min.css b/css/font-awesome.min.css index 3a45028e9..cffe183c0 100644 --- a/css/font-awesome.min.css +++ b/css/font-awesome.min.css @@ -49,8 +49,8 @@ .fa-icon-time:before{content:"\f017";} .fa-icon-road:before{content:"\f018";} .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-play-circle-alt:before{content:"\f01d";} .fa-icon-rotate-right:before,.fa-icon-repeat:before{content:"\f01e";} @@ -225,7 +225,7 @@ .fa-icon-envelope:before{content:"\f0e0";} .fa-icon-linkedin:before{content:"\f0e1";} .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-comment-alt:before{content:"\f0e5";} .fa-icon-comments-alt:before{content:"\f0e6";} diff --git a/less/icons.less b/less/icons.less index 158e4aaae..5e7bae598 100644 --- a/less/icons.less +++ b/less/icons.less @@ -27,8 +27,8 @@ .fa-icon-time:before { content: @time; } .fa-icon-road:before { content: @road; } .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-play-circle-alt:before { content: @play-circle-alt; } .fa-icon-rotate-right:before, @@ -214,6 +214,7 @@ .fa-icon-linkedin:before { content: @linkedin; } .fa-icon-rotate-left:before, .fa-icon-undo:before { content: @undo; } +.fa-icon-legal:before, .fa-icon-gavel:before { content: @gavel; } .fa-icon-dashboard:before, .fa-icon-tachometer:before { content: @tachometer; } diff --git a/less/variables.less b/less/variables.less index c93be5744..47e607e99 100644 --- a/less/variables.less +++ b/less/variables.less @@ -35,8 +35,8 @@ @time: "\f017"; @road: "\f018"; @download: "\f019"; -@arrow-down-circle-alt: "\f01a"; -@arrow-up-circle-alt: "\f01b"; +@arrow-circle-alt-down: "\f01a"; +@arrow-circle-alt-up: "\f01b"; @inbox: "\f01c"; @play-circle-alt: "\f01d"; @repeat: "\f01e"; diff --git a/scss/_icons.scss b/scss/_icons.scss index 1db80871c..3929a98d1 100644 --- a/scss/_icons.scss +++ b/scss/_icons.scss @@ -27,8 +27,8 @@ .icon-time:before { content: $time; } .icon-road:before { content: $road; } .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-play-circle-alt:before { content: $play-circle-alt; } .icon-rotate-right:before, @@ -214,6 +214,7 @@ .icon-linkedin:before { content: $linkedin; } .icon-rotate-left:before, .icon-undo:before { content: $undo; } +.icon-legal:before, .icon-gavel:before { content: $gavel; } .icon-dashboard:before, .icon-tachometer:before { content: $tachometer; } diff --git a/scss/_variables.scss b/scss/_variables.scss index 4b6faf00d..d0ef24629 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -60,9 +60,9 @@ $road: "\f018"; $download: "\f019"; -$arrow-down-circle-alt: "\f01a"; +$arrow-circle-alt-down: "\f01a"; -$arrow-up-circle-alt: "\f01b"; +$arrow-circle-alt-up: "\f01b"; $inbox: "\f01c"; diff --git a/src/_includes/examples/animated-spinner.html b/src/_includes/examples/animated-spinner.html index b1b20a406..9f244b1b7 100644 --- a/src/_includes/examples/animated-spinner.html +++ b/src/_includes/examples/animated-spinner.html @@ -13,7 +13,7 @@ Spinner icon when loading content... {% endhighlight %}

- CSS3 animations aren't supported in IE8 - IE9. + CSS3 animations aren't supported in IE8 - IE9.

diff --git a/src/_includes/examples/button-dropdowns.html b/src/_includes/examples/button-dropdowns.html index f9f7cee92..35bff703a 100644 --- a/src/_includes/examples/button-dropdowns.html +++ b/src/_includes/examples/button-dropdowns.html @@ -9,7 +9,7 @@ @@ -24,13 +24,13 @@ {% endhighlight %} -
Don't forget to add the appropriate JavaScript to enable button dropdowns.
+
Don't forget to add the appropriate JavaScript to enable button dropdowns.
diff --git a/src/_includes/examples/buttons.html b/src/_includes/examples/buttons.html index e99f6a6db..d5325d65e 100644 --- a/src/_includes/examples/buttons.html +++ b/src/_includes/examples/buttons.html @@ -12,7 +12,7 @@ Comment - Info + Info

@@ -42,7 +42,7 @@ Comment - Info + Info Delete diff --git a/src/_includes/examples/form-inputs.html b/src/_includes/examples/form-inputs.html index e923b1ba0..0b2556bac 100644 --- a/src/_includes/examples/form-inputs.html +++ b/src/_includes/examples/form-inputs.html @@ -3,7 +3,7 @@

- +

@@ -16,7 +16,7 @@ {% highlight html %}
- +
diff --git a/src/_includes/examples/inline-icons.html b/src/_includes/examples/inline-icons.html index 12b6aedba..70b0fab74 100644 --- a/src/_includes/examples/inline-icons.html +++ b/src/_includes/examples/inline-icons.html @@ -13,7 +13,7 @@ {% highlight html %} icon-camera-retro {% endhighlight %} -
Icon classes are echoed via CSS :before.
+
Icon classes are echoed via CSS :before.
diff --git a/src/_includes/examples/larger-icons.html b/src/_includes/examples/larger-icons.html index 5cd08e7bb..bf37e2176 100644 --- a/src/_includes/examples/larger-icons.html +++ b/src/_includes/examples/larger-icons.html @@ -27,7 +27,7 @@

fa-icon-camera-retro

{% endhighlight %}
- If your icons are getting chopped off on top and bottom, make sure you have + If your icons are getting chopped off on top and bottom, make sure you have sufficient line-height.
diff --git a/src/_includes/examples/list-bullets.html b/src/_includes/examples/list-bullets.html index 702196a77..3c52f620b 100644 --- a/src/_includes/examples/list-bullets.html +++ b/src/_includes/examples/list-bullets.html @@ -3,27 +3,27 @@
    -
  • List bullets (like these)
    • -
  • Buttons
    • -
  • Button groups
    • -
  • Navigation
    • -
  • Prepended form inputs
    • -
  • …and many more with custom CSS
    • +
  • List bullets (like these)
    • +
  • Buttons
    • +
  • Button groups
    • +
  • Navigation
    • +
  • Prepended form inputs
    • +
  • …and many more with custom CSS

Easily replace individual list bullets.

{% highlight html %}
    -
  • Bulleted lists (like this one)
    • -
  • Buttons
    • -
  • Button groups
    • -
  • Navigation
    • -
  • Prepended form inputs
    • -
  • …and many more with custom CSS
    • +
  • Bulleted lists (like this one)
    • +
  • Buttons
    • +
  • Button groups
    • +
  • Navigation
    • +
  • Prepended form inputs
    • +
  • …and many more with custom CSS
{% endhighlight %} -
Make sure to NOT include any whitespace after the icon declaration.
+
Make sure to NOT include any whitespace after the icon declaration.
diff --git a/src/_includes/examples/new.html b/src/_includes/examples/new.html index fc0a369cb..c0c4b29b7 100644 --- a/src/_includes/examples/new.html +++ b/src/_includes/examples/new.html @@ -20,22 +20,22 @@ - fa-icon-twitter on fa-icon-check-empty
+ fa-icon-twitter on fa-icon-unchecked
fa-icon-flag on fa-icon-circle
- + - fa-icon-terminal on fa-icon-sign-blank
+ fa-icon-terminal on fa-icon-square
- + - fa-icon-camera on fa-icon-ban-circle + fa-icon-camera on fa-icon-ban @@ -43,10 +43,10 @@

Better Bulleted Lists

diff --git a/src/_includes/examples/rotated-flipped.html b/src/_includes/examples/rotated-flipped.html index e727134b7..b20762eff 100644 --- a/src/_includes/examples/rotated-flipped.html +++ b/src/_includes/examples/rotated-flipped.html @@ -22,7 +22,7 @@   icon-flip-vertical {% endhighlight %}

- Rotating and flipping icons aren't yet supported in IE7. + Rotating and flipping icons aren't yet supported in IE7.

diff --git a/src/_includes/examples/stacked.html b/src/_includes/examples/stacked.html index d50d0da35..11532ab1d 100644 --- a/src/_includes/examples/stacked.html +++ b/src/_includes/examples/stacked.html @@ -18,15 +18,15 @@ fa-icon-flag on fa-icon-circle
- + - fa-icon-terminal on fa-icon-sign-blank
+ fa-icon-terminal on fa-icon-square
- + - fa-icon-camera on fa-icon-ban-circle + fa-icon-camera on fa-icon-ban {% highlight html %} diff --git a/src/_includes/get-started.html b/src/_includes/get-started.html index e9a18d66e..068bbcf1a 100644 --- a/src/_includes/get-started.html +++ b/src/_includes/get-started.html @@ -18,7 +18,7 @@ {% endhighlight %}
- Want to use Font Awesome by itself without Bootstrap? Just don't include the first line. + Want to use Font Awesome by itself without Bootstrap? Just don't include the first line.
  • @@ -66,7 +66,7 @@ {% highlight html %} @FontAwesomePath: "../font"; {% endhighlight %} -

    The font path is relative from your compiled CSS directory.

    +

    The font path is relative from your compiled CSS directory.

  • Re-compile your LESS if using a static compiler. Otherwise, you should be good to go.
  • Check out the examples to start using Font Awesome!
    • diff --git a/src/_includes/jumbotron-carousel.html b/src/_includes/jumbotron-carousel.html index c464235e4..917e06c1d 100644 --- a/src/_includes/jumbotron-carousel.html +++ b/src/_includes/jumbotron-carousel.html @@ -7,7 +7,7 @@
    -    +    Download
    @@ -39,10 +39,10 @@ - + - + diff --git a/src/_includes/license.html b/src/_includes/license.html index 1bde75d1b..758153368 100644 --- a/src/_includes/license.html +++ b/src/_includes/license.html @@ -10,7 +10,7 @@
    diff --git a/src/_includes/navbar.html b/src/_includes/navbar.html index 8ddb028f6..a1b28820e 100644 --- a/src/_includes/navbar.html +++ b/src/_includes/navbar.html @@ -27,7 +27,7 @@
  •   Currency Icons
  •   Text Editor Icons
  •   Directional Icons
    • -
  •   Video Player Icons
    • +
  •   Video Player Icons
  •   Brand Icons
  •   Medical Icons
    • diff --git a/src/_includes/tests/stacked-inside-anchor.html b/src/_includes/tests/stacked-inside-anchor.html index e428704dd..94e51c2b6 100644 --- a/src/_includes/tests/stacked-inside-anchor.html +++ b/src/_includes/tests/stacked-inside-anchor.html @@ -1,21 +1,21 @@

    - + Twitter Icon - + Facebook Icon - + GitHub Icon @@ -47,21 +47,21 @@

    - + Twitter Icon - + Facebook Icon - + GitHub Icon diff --git a/src/_includes/whats-new.html b/src/_includes/whats-new.html index fdd7e6f62..6fe5b5bc2 100644 --- a/src/_includes/whats-new.html +++ b/src/_includes/whats-new.html @@ -18,7 +18,7 @@ A long term solution is now in place for SCSS support. Need SASS? Try sass-convert.

    -

    Better & Simpler License

    +

    Better & Simpler License

    SIL OFL 1.1 for font, MIT license for code. No more attribution required, but much appreciated.
    @@ -30,7 +30,7 @@ Thanks to @grantgordon and @johnsmclay, you can subset to get just the icons you need.
    -

    Want More Details?

    +

    Want More Details?

    Check out the CHANGELOG on the GitHub project to see what's new and changed.
    diff --git a/src/_includes/why.html b/src/_includes/why.html index 4b370ccb5..b7be77f26 100644 --- a/src/_includes/why.html +++ b/src/_includes/why.html @@ -17,11 +17,11 @@ Font Awesome is completely free for commercial use. Check out the license.
    -

    IE7 Support

    +

    IE7 Support

    Font Awesome supports IE7. If you need it, you have my condolences.
    -

    Perfect on Retina Displays

    +

    Perfect on Retina Displays

    Font Awesome icons are vectors, which mean they're gorgeous on high-resolution displays.
    diff --git a/src/icons.yml b/src/icons.yml index a81117110..4e9ece766 100644 --- a/src/icons.yml +++ b/src/icons.yml @@ -177,15 +177,15 @@ icons: categories: - 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 created: 1.0 categories: - 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 created: 1.0 categories: @@ -1450,6 +1450,8 @@ icons: id: gavel unicode: f0e3 created: 2.0 + aliases: + - legal categories: - Web Application Icons diff --git a/src/license.html b/src/license.html index 9442f5827..aef54a23c 100644 --- a/src/license.html +++ b/src/license.html @@ -4,7 +4,7 @@ title: Font Awesome License navbar_active: license relative_path: ../ --- -{% capture jumbotron_h1 %}  License{% endcapture %} +{% capture jumbotron_h1 %}  License{% endcapture %} {% capture jumbotron_p %}The full details of how Font Awesome is licensed{% endcapture %} {% include jumbotron.html %}