diff --git a/_config.yml b/_config.yml index 8b2bf8b61..a59e0183c 100644 --- a/_config.yml +++ b/_config.yml @@ -51,8 +51,8 @@ fontawesome: url: http://creativecommons.org/licenses/by/3.0/ bootstrap: - version: 3.0.2 + version: 3.1.1 url: http://getbootstrap.com jquery: - version: 1.10.2 + version: 1.11.0 diff --git a/src/_includes/examples/basic.html b/src/_includes/examples/basic.html new file mode 100644 index 000000000..1cc6a8cdb --- /dev/null +++ b/src/_includes/examples/basic.html @@ -0,0 +1,30 @@ +
+

Basic Icons

+ +
+
+

+ fa-camera-retro +

+
+
+

+ You can place Font Awesome icons just about anywhere using the CSS Prefix fa and the icon's + name. Font Awesome is designed to be used with inline elements (we like the <i> tag for + brevity, but using a <span> is more semantically correct). +

+{% highlight html %} + fa-camera-retro +{% endhighlight %} +
+
    +
  • + + If you change the font-size of the icon's container, the icon gets bigger. Same things goes for color, + drop shadow, and anything else that gets inherited using CSS. +
    • +
+
+
+
+
diff --git a/src/_includes/examples/bordered-pulled.html b/src/_includes/examples/bordered-pulled.html index f22ee8e35..1ff4d12db 100644 --- a/src/_includes/examples/bordered-pulled.html +++ b/src/_includes/examples/bordered-pulled.html @@ -3,18 +3,21 @@

- - Use a few styles together and you'll have easy pull quotes or a great introductory article icon. + + …tomorrow we will run faster, stretch out our arms farther… And then one fine morning— + So we beat on, boats against the current, borne back ceaselessly into the past.

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

{% highlight html %} - -Use a few styles together and you'll have easy pull quotes or a great introductory article icon. + +...tomorrow we will run faster, stretch out our arms farther... +And then one fine morning— So we beat on, boats against the +current, borne back ceaselessly into the past. {% endhighlight %}
diff --git a/src/_includes/examples/fixed-width.html b/src/_includes/examples/fixed-width.html index f14e7e43b..78c3d0a30 100644 --- a/src/_includes/examples/fixed-width.html +++ b/src/_includes/examples/fixed-width.html @@ -2,25 +2,25 @@

Fixed Width Icons

- +
+   Home +   Library +   Applications +   Settings +

- Use fa-fw to set icons at a fixed width. Great to use when variable icon widths throw off alignment. - Especially useful in things like nav lists. + Use fa-fw to set icons at a fixed width. Great to use when different icon widths throw off alignment. + Especially useful in things like nav lists & list groups.

{% highlight html %} - +
+   Home +   Library +   Applications +   Settings +
{% endhighlight %}
diff --git a/src/_includes/examples/inline.html b/src/_includes/examples/inline.html deleted file mode 100644 index 93f302458..000000000 --- a/src/_includes/examples/inline.html +++ /dev/null @@ -1,17 +0,0 @@ -
-

Inline Icons

-
-
-

- fa-camera-retro -

-
-
-

Place Font Awesome icons just about anywhere with the <i> tag.

-{% highlight html %} - fa-camera-retro -{% endhighlight %} -
Icon classes are echoed via CSS :before.
-
-
-
diff --git a/src/_includes/examples/larger.html b/src/_includes/examples/larger.html index 8c5e24636..85aa7da82 100644 --- a/src/_includes/examples/larger.html +++ b/src/_includes/examples/larger.html @@ -2,11 +2,11 @@

Larger Icons

-

fa-camera-retro

-

fa-camera-retro

-

fa-camera-retro

-

fa-camera-retro

-

fa-camera-retro

+

fa-lg

+

fa-2x

+

fa-3x

+

fa-4x

+

fa-5x

@@ -14,15 +14,20 @@ fa-3x, fa-4x, or fa-5x classes.

{% highlight html %} -

fa-camera-retro

-

fa-camera-retro

-

fa-camera-retro

-

fa-camera-retro

-

fa-camera-retro

+ fa-lg + fa-2x + fa-3x + fa-4x + fa-5x {% endhighlight %}
- If your icons are getting chopped off on top and bottom, make sure you have - sufficient line-height. +
    +
  • + + 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.html b/src/_includes/examples/list.html index 5cbc17585..880015ab0 100644 --- a/src/_includes/examples/list.html +++ b/src/_includes/examples/list.html @@ -3,20 +3,20 @@

Use fa-ul and fa-li to easily replace default bullets in unordered lists.

{% highlight html %} {% endhighlight %}
diff --git a/src/_includes/examples/rotated-flipped.html b/src/_includes/examples/rotated-flipped.html index ff55f2c1c..588e0942a 100644 --- a/src/_includes/examples/rotated-flipped.html +++ b/src/_includes/examples/rotated-flipped.html @@ -16,12 +16,12 @@ To arbitrarily rotate and flip icons, use the fa-rotate-* and fa-flip-* classes.

{% highlight html %} -  normal
-  fa-rotate-90
-  fa-rotate-180
-  fa-rotate-270
-  fa-flip-horizontal
-  icon-flip-vertical + normal
+ fa-rotate-90
+ fa-rotate-180
+ fa-rotate-270
+ fa-flip-horizontal
+ icon-flip-vertical {% endhighlight %}
diff --git a/src/_includes/navbar.html b/src/_includes/navbar.html index 31635edfc..339bd11aa 100644 --- a/src/_includes/navbar.html +++ b/src/_includes/navbar.html @@ -46,7 +46,7 @@