From a72b212e1721f70eda14292530d3a78ce66de211 Mon Sep 17 00:00:00 2001 From: davegandy Date: Mon, 7 Oct 2013 17:25:45 -0400 Subject: [PATCH] more updates for new fa-icon css prefix --- .../community/requesting-new-icons.html | 2 +- src/_includes/examples/animated-spinner.html | 10 +- src/_includes/examples/bordered-pulled.html | 10 +- src/_includes/examples/button-dropdowns.html | 22 +- src/_includes/examples/button-groups.html | 16 +- src/_includes/examples/buttons.html | 34 +- src/_includes/examples/form-inputs.html | 8 +- src/_includes/examples/inline-icons.html | 6 +- src/_includes/examples/larger-icons.html | 26 +- src/_includes/examples/list-bullets.html | 30 +- src/_includes/examples/navigation.html | 16 +- src/_includes/examples/new.html | 54 +-- src/_includes/examples/rotated-flipped.html | 26 +- src/_includes/examples/stacked.html | 68 +-- src/_includes/license.html | 11 +- .../tests/rotated-flipped-inside-anchor.html | 12 +- .../tests/rotated-flipped-inside-btn.html | 12 +- src/_includes/tests/rotated-flipped.html | 12 +- .../tests/stacked-inside-anchor.html | 54 +-- src/_includes/tests/stacked.html | 54 +-- src/_includes/whats-new.html | 14 +- src/community.html | 2 +- src/examples.html | 2 +- src/license.html | 2 +- src/test.html | 398 +++++++++--------- src/whats-new.html | 2 +- 26 files changed, 452 insertions(+), 451 deletions(-) diff --git a/src/_includes/community/requesting-new-icons.html b/src/_includes/community/requesting-new-icons.html index 1b723dea5..a59b7b185 100644 --- a/src/_includes/community/requesting-new-icons.html +++ b/src/_includes/community/requesting-new-icons.html @@ -21,7 +21,7 @@
  • Concrete objects make good icons, since abstract concepts are, well, abstract. It's harder to make an icon - to represent happiness. It's easier to make a smiley face. + to represent happiness. It's easier to make a smiley face.
  • diff --git a/src/_includes/examples/animated-spinner.html b/src/_includes/examples/animated-spinner.html index cb90d25c4..b1b20a406 100644 --- a/src/_includes/examples/animated-spinner.html +++ b/src/_includes/examples/animated-spinner.html @@ -2,18 +2,18 @@
    - Use the fa-spin class to get any icon to rotate. Works well with fa-spinner, - fa-refresh, and fa-cog. + Use the fa-icon-spin class to get any icon to rotate. Works well with fa-icon-spinner, + fa-icon-refresh, and fa-icon-cog.
    - Spinner icon when loading content... + Spinner icon when loading content...
    {% highlight html %} - Spinner icon when loading content... + 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/bordered-pulled.html b/src/_includes/examples/bordered-pulled.html index 2439cdb99..a85a8871b 100644 --- a/src/_includes/examples/bordered-pulled.html +++ b/src/_includes/examples/bordered-pulled.html @@ -3,29 +3,29 @@

    - Use fa-border and pull-right or pull-left for easy pull quotes or + Use fa-icon-border and pull-right or pull-left for easy pull quotes or article graphics.

    - + Use a few of the new styles together, and you've got easy pull quotes or a great introductory article image. 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 %} - + Use a few of the new styles together ... lots of new possibilities. {% endhighlight %}
    - + Use a few of the new styles together, and you've got easy pull quotes or a great introductory article image. 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 %} - + Use a few of the new styles together ... lots of new possibilities. {% endhighlight %}
    diff --git a/src/_includes/examples/button-dropdowns.html b/src/_includes/examples/button-dropdowns.html index 644b83f6a..f9f7cee92 100644 --- a/src/_includes/examples/button-dropdowns.html +++ b/src/_includes/examples/button-dropdowns.html @@ -3,13 +3,13 @@
    - User + User - + @@ -18,19 +18,19 @@
    {% highlight html %} {% 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/button-groups.html b/src/_includes/examples/button-groups.html index 83b8475be..955502466 100644 --- a/src/_includes/examples/button-groups.html +++ b/src/_includes/examples/button-groups.html @@ -4,20 +4,20 @@

    - - - - + + + +

    {% highlight html %}
    - - - - + + + +
    {% endhighlight %}
    diff --git a/src/_includes/examples/buttons.html b/src/_includes/examples/buttons.html index 859683e57..b5a8aecee 100644 --- a/src/_includes/examples/buttons.html +++ b/src/_includes/examples/buttons.html @@ -4,53 +4,53 @@

    - Reload + Reload - Checkout + Checkout

    - Comment + Comment - Info + Info

    - Delete + Delete - Settings + Settings

    - Font Awesome
    Version {{ site.fontawesome.version }}
    + Font Awesome
    Version {{ site.fontawesome.version }}

    - Synchronizing Content... + Synchronizing Content...

    Font Awesome icons work great in buttons. You can even combine them with larger icon styles, - pull-right and pull-left, and fa-spin. + pull-right and pull-left, and fa-icon-spin.

    {% highlight html %} - Reload + Reload - Checkout + Checkout - Comment + Comment - Info + Info - Delete + Delete - Settings + Settings - Font Awesome
    Version {{ site.fontawesome.version }}
    + Font Awesome
    Version {{ site.fontawesome.version }} - Synchronizing Content... + Synchronizing Content... {% endhighlight %}
    diff --git a/src/_includes/examples/form-inputs.html b/src/_includes/examples/form-inputs.html index 2b0179061..e923b1ba0 100644 --- a/src/_includes/examples/form-inputs.html +++ b/src/_includes/examples/form-inputs.html @@ -3,12 +3,12 @@
    - +

    - +
    @@ -16,11 +16,11 @@ {% highlight html %}
    - +
    - +
    diff --git a/src/_includes/examples/inline-icons.html b/src/_includes/examples/inline-icons.html index 4406f537a..12b6aedba 100644 --- a/src/_includes/examples/inline-icons.html +++ b/src/_includes/examples/inline-icons.html @@ -7,13 +7,13 @@
    - icon-camera-retro + icon-camera-retro
    {% highlight html %} - icon-camera-retro + 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 24de15988..5cd08e7bb 100644 --- a/src/_includes/examples/larger-icons.html +++ b/src/_includes/examples/larger-icons.html @@ -3,31 +3,31 @@

    - To increase the size of icons relative to its container, use fa-lg, fa-2x, - fa-3x, or fa-4x. + To increase the size of icons relative to its container, use fa-icon-lg, fa-icon-2x, + fa-icon-3x, or fa-icon-4x.

    - Increase the icon size by using the fa-lg (33% increase), fa-2x, - fa-3x, or fa-4x classes. + Increase the icon size by using the fa-icon-lg (33% increase), fa-icon-2x, + fa-icon-3x, or fa-icon-4x classes.

    -

    fa-camera-retro

    -

    fa-camera-retro

    -

    fa-camera-retro

    -

    fa-camera-retro

    +

    fa-icon-camera-retro

    +

    fa-icon-camera-retro

    +

    fa-icon-camera-retro

    +

    fa-icon-camera-retro

    {% highlight html %} -

    fa-camera-retro

    -

    fa-camera-retro

    -

    fa-camera-retro

    -

    fa-camera-retro

    +

    fa-icon-camera-retro

    +

    fa-icon-camera-retro

    +

    fa-icon-camera-retro

    +

    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 0e4b5b475..702196a77 100644 --- a/src/_includes/examples/list-bullets.html +++ b/src/_includes/examples/list-bullets.html @@ -2,28 +2,28 @@
    -
      -
    • 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/navigation.html b/src/_includes/examples/navigation.html index 360da1f54..6a4c70720 100644 --- a/src/_includes/examples/navigation.html +++ b/src/_includes/examples/navigation.html @@ -3,20 +3,20 @@

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

    {% highlight html %} {% endhighlight %}
    diff --git a/src/_includes/examples/new.html b/src/_includes/examples/new.html index cd37dfb83..fc0a369cb 100644 --- a/src/_includes/examples/new.html +++ b/src/_includes/examples/new.html @@ -4,49 +4,49 @@

    Rotated and Flipped Icons

    -   normal
    -   fa-rotate-90
    -   fa-rotate-180
    -   fa-rotate-270
    -   fa-flip-horizontal
    -   fa-flip-vertical +   normal
    +   fa-icon-rotate-90
    +   fa-icon-rotate-180
    +   fa-icon-rotate-270
    +   fa-icon-flip-horizontal
    +   fa-icon-flip-vertical

    Stacked Icons

    - - - + + + - fa-twitter on fa-check-empty
    - - - + fa-icon-twitter on fa-icon-check-empty
    + + + - fa-flag on fa-circle
    - - - + fa-icon-flag on fa-icon-circle
    + + + - fa-terminal on fa-sign-blank
    - - - + fa-icon-terminal on fa-icon-sign-blank
    + + + - fa-camera on fa-ban-circle + fa-icon-camera on fa-icon-ban-circle

    Better Bulleted Lists

    -
      -
    • New bulleted lists
    • -
    • Fix some old bugs
    • -
    • And deal with arbitrary
    • -
    • Font sizes better
    • +
        +
      • New bulleted lists
      • +
      • Fix some old bugs
      • +
      • And deal with arbitrary
      • +
      • Font sizes better
    diff --git a/src/_includes/examples/rotated-flipped.html b/src/_includes/examples/rotated-flipped.html index 7321a0657..e727134b7 100644 --- a/src/_includes/examples/rotated-flipped.html +++ b/src/_includes/examples/rotated-flipped.html @@ -6,23 +6,23 @@
    -   normal
    -   fa-rotate-90
    -   fa-rotate-180
    -   fa-rotate-270
    -   fa-flip-horizontal
    -   fa-flip-vertical +   normal
    +   fa-icon-rotate-90
    +   fa-icon-rotate-180
    +   fa-icon-rotate-270
    +   fa-icon-flip-horizontal
    +   fa-icon-flip-vertical
    {% highlight html %} -  normal
    -  fa-rotate-90
    -  fa-rotate-180
    -  fa-rotate-270
    -  fa-flip-horizontal
    -  icon-flip-vertical +  normal
    +  fa-icon-rotate-90
    +  fa-icon-rotate-180
    +  fa-icon-rotate-270
    +  fa-icon-flip-horizontal
    +  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 662449394..d50d0da35 100644 --- a/src/_includes/examples/stacked.html +++ b/src/_includes/examples/stacked.html @@ -2,53 +2,53 @@
    - A method for easily stacking multiple icons. Use the fa-stack class on the parent and - fa-stack-base for the bottom icon. + A method for easily stacking multiple icons. Use the fa-icon-stack class on the parent and + fa-icon-stack-base for the bottom icon.
    - - - + + + - fa-twitter on fa-check-empty
    - - - + fa-icon-twitter on fa-icon-unchecked
    + + + - fa-flag on fa-circle
    - - - + fa-icon-flag on fa-icon-circle
    + + + - fa-terminal on fa-sign-blank
    - - - + fa-icon-terminal on fa-icon-sign-blank
    + + + - fa-camera on fa-ban-circle + fa-icon-camera on fa-icon-ban-circle
    {% highlight html %} - - - + + + -fa-twitter on fa-check-empty
    - - - +fa-icon-twitter on fa-icon-unchecked
    + + + -fa-flag on fa-circle
    - - - +fa-icon-flag on fa-icon-circle
    + + + -fa-terminal on fa-sign-blank
    - - - +fa-icon-terminal on fa-icon-sign-blank
    + + + -fa-camera on fa-ban-circle +fa-icon-camera on fa-icon-ban-circle {% endhighlight %}
    diff --git a/src/_includes/license.html b/src/_includes/license.html index e83771e6e..1bde75d1b 100644 --- a/src/_includes/license.html +++ b/src/_includes/license.html @@ -8,9 +8,9 @@
    -
      +
      • - Attribution is no longer required as of Font Awesome 3.0 but is much appreciated: + Attribution is no longer required as of Font Awesome 3.0 but is much appreciated: "Font Awesome by Dave Gandy - http://fontawesome.io".
      @@ -22,7 +22,7 @@
      • Applies to all desktop and webfont files in the following directory: - font-awesome/font/. + font-awesome/fonts/.
      • License: {{ site.fontawesome.license.font.version }}
      • URL: {{ site.fontawesome.license.font.url }}
      • @@ -34,8 +34,9 @@
        • Applies to all CSS and LESS files in the following directories: - font-awesome/css/ and - font-awesome/less/. + font-awesome/css/, + font-awesome/less/, and + font-awesome/scss/.
        • License: {{ site.fontawesome.license.code.version }}
        • URL: {{ site.fontawesome.license.code.url }}
        • diff --git a/src/_includes/tests/rotated-flipped-inside-anchor.html b/src/_includes/tests/rotated-flipped-inside-anchor.html index 111f1a37a..3dfc80fb1 100644 --- a/src/_includes/tests/rotated-flipped-inside-anchor.html +++ b/src/_includes/tests/rotated-flipped-inside-anchor.html @@ -1,6 +1,6 @@ -  normal
          -  fa-rotate-90
          -  fa-rotate-180
          -  fa-rotate-270
          -  fa-flip-horizontal
          -  fa-flip-vertical +  normal
          +  fa-icon-rotate-90
          +  fa-icon-rotate-180
          +  fa-icon-rotate-270
          +  fa-icon-flip-horizontal
          +  fa-icon-flip-vertical diff --git a/src/_includes/tests/rotated-flipped-inside-btn.html b/src/_includes/tests/rotated-flipped-inside-btn.html index fc0d78829..3c5f63b29 100644 --- a/src/_includes/tests/rotated-flipped-inside-btn.html +++ b/src/_includes/tests/rotated-flipped-inside-btn.html @@ -1,6 +1,6 @@ -  normal
          -  fa-rotate-90
          -  fa-rotate-180
          -  fa-rotate-270
          -  fa-flip-horizontal
          -  fa-flip-vertical +  normal
          +  fa-icon-rotate-90
          +  fa-icon-rotate-180
          +  fa-icon-rotate-270
          +  fa-icon-flip-horizontal
          +  fa-icon-flip-vertical diff --git a/src/_includes/tests/rotated-flipped.html b/src/_includes/tests/rotated-flipped.html index 13a83f4b6..4714941c8 100644 --- a/src/_includes/tests/rotated-flipped.html +++ b/src/_includes/tests/rotated-flipped.html @@ -1,6 +1,6 @@ -  normal
          -  fa-rotate-90
          -  fa-rotate-180
          -  fa-rotate-270
          -  fa-flip-horizontal
          -  fa-flip-vertical +  normal
          +  fa-icon-rotate-90
          +  fa-icon-rotate-180
          +  fa-icon-rotate-270
          +  fa-icon-flip-horizontal
          +  fa-icon-flip-vertical diff --git a/src/_includes/tests/stacked-inside-anchor.html b/src/_includes/tests/stacked-inside-anchor.html index 6f9c4d595..e428704dd 100644 --- a/src/_includes/tests/stacked-inside-anchor.html +++ b/src/_includes/tests/stacked-inside-anchor.html @@ -1,68 +1,68 @@

          - - - + + + Twitter Icon - - - + + + Facebook Icon - - - + + + GitHub Icon

          - - - + + + Twitter Icon - - - + + + Facebook Icon - - - + + + GitHub Icon

          - - - + + + Twitter Icon - - - + + + Facebook Icon - - - + + + GitHub Icon diff --git a/src/_includes/tests/stacked.html b/src/_includes/tests/stacked.html index 5954f85cd..9fb459faa 100644 --- a/src/_includes/tests/stacked.html +++ b/src/_includes/tests/stacked.html @@ -1,51 +1,51 @@

          - - - + + + Twitter Icon - - - + + + Facebook Icon - - - + + + GitHub Icon

          - - - + + + Twitter Icon - - - + + + Facebook Icon - - - + + + GitHub Icon

          - - - + + + Twitter Icon - - - + + + Facebook Icon - - - + + + GitHub Icon

          \ No newline at end of file diff --git a/src/_includes/whats-new.html b/src/_includes/whats-new.html index aeb888998..6b5b7c8f3 100644 --- a/src/_includes/whats-new.html +++ b/src/_includes/whats-new.html @@ -10,27 +10,27 @@
          -

          {{ icons | version:site.fontawesome.minor_version | size }} New Icons in {{ site.fontawesome.minor_version }}

          +

          {{ icons | version:site.fontawesome.minor_version | size }} New Icons in {{ site.fontawesome.minor_version }}

          Requested by the active community on the Font Awesome GitHub project.
          -

          SCSS Support

          +

          SCSS Support

          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.
          -

          Pixel Perfection at 14px

          - Version 3 was re-created from the ground up to be razor sharp at Bootstrap's default 14px. +

          Pixel Perfection at 14px

          + Version 3 was re-created from the ground up to be razor sharp at Bootstrap's defa-iconult 14px.
          -

          Font Subsetting

          +

          Font Subsetting

          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/community.html b/src/community.html index e53a67bac..3bd442277 100644 --- a/src/community.html +++ b/src/community.html @@ -4,7 +4,7 @@ title: The Font Awesome Community navbar_active: community relative_path: ../ --- -{% capture jumbotron_h1 %}  Community{% endcapture %} +{% capture jumbotron_h1 %}  Community{% endcapture %} {% capture jumbotron_p %}Lots of ways to get involved with Font Awesome{% endcapture %} {% include jumbotron.html %} diff --git a/src/examples.html b/src/examples.html index 1aca2b7b0..49e82802e 100644 --- a/src/examples.html +++ b/src/examples.html @@ -4,7 +4,7 @@ title: Font Awesome Examples navbar_active: examples relative_path: ../ --- -{% capture jumbotron_h1 %}  Examples{% endcapture %} +{% capture jumbotron_h1 %}  Examples{% endcapture %} {% capture jumbotron_p %}Lots of easy ways to use Font Awesome{% endcapture %} {% include jumbotron.html %} diff --git a/src/license.html b/src/license.html index 2286985a8..3e9501204 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 %} diff --git a/src/test.html b/src/test.html index ce39cb3d5..8cefebb5e 100644 --- a/src/test.html +++ b/src/test.html @@ -11,67 +11,67 @@ relative_path: ../
          - Building + Building
          - Building Large + Building Large
          - Building + Building
          - Building Large + Building Large
          - Building + Building
          - Building Large + Building Large
          - Building Large + Building Large
          - Circle + Circle
          - Circle Large + Circle Large
          - Circle + Circle
          - Circle Large + Circle Large
          - Circle + Circle
          - Circle Large + Circle Large
          - Circle Large + Circle Large
          @@ -79,42 +79,42 @@ relative_path: ../

          Links with Icons icon should activate link & NOT underline

          @@ -122,23 +122,23 @@ relative_path: ../

          Navbar should stay same height

          @@ -151,23 +151,23 @@ relative_path: ../
          - - + +
          - - + +
          - - + +
          - - + +
          @@ -175,23 +175,23 @@ relative_path: ../
          - - + +
          - - + +
          - - + +
          - - + +
    @@ -201,23 +201,23 @@ relative_path: ../
    - - + +
    - - + +
    - - + +
    - - + +
    @@ -225,23 +225,23 @@ relative_path: ../
    - - + +
    - - + +
    - - + +
    - - + +
    @@ -254,23 +254,23 @@ relative_path: ../
    Button - Button - + Button +
    Button - Button - + Button +
    Button - Button - + Button +
    Button - Button - + Button +
    @@ -278,23 +278,23 @@ relative_path: ../
    Button - Button - + Button +
    Button - Button - + Button +
    Button - Button - + Button +
    Button - Button - + Button +
    @@ -304,23 +304,23 @@ relative_path: ../
    Button - Button - + Button +
    Button - Button - + Button +
    Button - Button - + Button +
    Button - Button - + Button +
    @@ -328,23 +328,23 @@ relative_path: ../
    Button - Button - + Button +
    Button - Button - + Button +
    Button - Button - + Button +
    Button - Button - + Button +
    @@ -356,7 +356,7 @@ relative_path: ../
    + Loading... + - Loading... - - Loading... + Loading... + + Loading...
    - Loading... - + Loading... + - Loading... - + Loading... +
    - Loading... - + Loading... + - Loading... - + Loading... +
    -

    fa-lg

    +

    fa-icon-lg

    - Loading... - + Loading... + - Loading... - + Loading... +
    - Loading... - + Loading... + - Loading... - + Loading... +
    - Loading... - + Loading... + - Loading... - + Loading... +

    Bootstrap Prepend and Append

    - +
    - +
    diff --git a/src/whats-new.html b/src/whats-new.html index 95dcf3aff..4fd4d3197 100644 --- a/src/whats-new.html +++ b/src/whats-new.html @@ -4,7 +4,7 @@ title: What's New navbar_active: whats-new relative_path: ../ --- -{% capture jumbotron_h1 %}  What's New{% endcapture %} +{% capture jumbotron_h1 %}  What's New{% endcapture %} {% capture jumbotron_p %}What's New in the latest version — Font Awesome {{ site.fontawesome.minor_version }}{% endcapture %} {% include jumbotron.html %}