From 40e7a3ac6b828094e3fbd585fd4fa81059477e18 Mon Sep 17 00:00:00 2001 From: Dave Gandy Date: Wed, 14 May 2014 00:09:29 -0500 Subject: [PATCH] fixing up examples a bit, addressing #2451 --- _config.yml | 4 +- src/_includes/examples/basic.html | 30 + src/_includes/examples/bordered-pulled.html | 13 +- src/_includes/examples/fixed-width.html | 28 +- src/_includes/examples/inline.html | 17 - src/_includes/examples/larger.html | 29 +- src/_includes/examples/list.html | 12 +- src/_includes/examples/rotated-flipped.html | 12 +- src/_includes/navbar.html | 2 +- src/_layouts/base.html | 5 +- src/assets/js/bootstrap-3.1.1.min.js | 6 + src/assets/less/bootstrap-3.1.1/.csscomb.json | 297 ++++++ src/assets/less/bootstrap-3.1.1/.csslintrc | 19 + src/assets/less/bootstrap-3.1.1/alerts.less | 67 ++ src/assets/less/bootstrap-3.1.1/badges.less | 55 ++ .../less/bootstrap-3.1.1/bootstrap.less | 49 + .../less/bootstrap-3.1.1/breadcrumbs.less | 26 + .../less/bootstrap-3.1.1/button-groups.less | 226 +++++ src/assets/less/bootstrap-3.1.1/buttons.less | 159 +++ src/assets/less/bootstrap-3.1.1/carousel.less | 232 +++++ src/assets/less/bootstrap-3.1.1/close.less | 33 + src/assets/less/bootstrap-3.1.1/code.less | 63 ++ .../bootstrap-3.1.1/component-animations.less | 29 + .../less/bootstrap-3.1.1/dropdowns.less | 213 ++++ src/assets/less/bootstrap-3.1.1/forms.less | 438 +++++++++ .../less/bootstrap-3.1.1/glyphicons.less | 233 +++++ src/assets/less/bootstrap-3.1.1/grid.less | 84 ++ .../less/bootstrap-3.1.1/input-groups.less | 162 +++ .../less/bootstrap-3.1.1/jumbotron.less | 44 + src/assets/less/bootstrap-3.1.1/labels.less | 64 ++ .../less/bootstrap-3.1.1/list-group.less | 110 +++ src/assets/less/bootstrap-3.1.1/media.less | 56 ++ src/assets/less/bootstrap-3.1.1/mixins.less | 929 ++++++++++++++++++ src/assets/less/bootstrap-3.1.1/modals.less | 139 +++ src/assets/less/bootstrap-3.1.1/navbar.less | 616 ++++++++++++ src/assets/less/bootstrap-3.1.1/navs.less | 242 +++++ .../less/bootstrap-3.1.1/normalize.less | 423 ++++++++ src/assets/less/bootstrap-3.1.1/pager.less | 55 ++ .../less/bootstrap-3.1.1/pagination.less | 88 ++ src/assets/less/bootstrap-3.1.1/panels.less | 241 +++++ src/assets/less/bootstrap-3.1.1/popovers.less | 133 +++ src/assets/less/bootstrap-3.1.1/print.less | 101 ++ .../less/bootstrap-3.1.1/progress-bars.less | 80 ++ .../bootstrap-3.1.1/responsive-utilities.less | 92 ++ .../less/bootstrap-3.1.1/scaffolding.less | 134 +++ src/assets/less/bootstrap-3.1.1/tables.less | 233 +++++ src/assets/less/bootstrap-3.1.1/theme.less | 247 +++++ .../less/bootstrap-3.1.1/thumbnails.less | 36 + src/assets/less/bootstrap-3.1.1/tooltip.less | 95 ++ src/assets/less/bootstrap-3.1.1/type.less | 293 ++++++ .../less/bootstrap-3.1.1/utilities.less | 56 ++ .../less/bootstrap-3.1.1/variables.less | 829 ++++++++++++++++ src/assets/less/bootstrap-3.1.1/wells.less | 29 + src/examples.html | 2 +- 54 files changed, 7843 insertions(+), 67 deletions(-) create mode 100644 src/_includes/examples/basic.html delete mode 100644 src/_includes/examples/inline.html create mode 100755 src/assets/js/bootstrap-3.1.1.min.js create mode 100755 src/assets/less/bootstrap-3.1.1/.csscomb.json create mode 100755 src/assets/less/bootstrap-3.1.1/.csslintrc create mode 100755 src/assets/less/bootstrap-3.1.1/alerts.less create mode 100755 src/assets/less/bootstrap-3.1.1/badges.less create mode 100755 src/assets/less/bootstrap-3.1.1/bootstrap.less create mode 100755 src/assets/less/bootstrap-3.1.1/breadcrumbs.less create mode 100755 src/assets/less/bootstrap-3.1.1/button-groups.less create mode 100755 src/assets/less/bootstrap-3.1.1/buttons.less create mode 100755 src/assets/less/bootstrap-3.1.1/carousel.less create mode 100755 src/assets/less/bootstrap-3.1.1/close.less create mode 100755 src/assets/less/bootstrap-3.1.1/code.less create mode 100755 src/assets/less/bootstrap-3.1.1/component-animations.less create mode 100755 src/assets/less/bootstrap-3.1.1/dropdowns.less create mode 100755 src/assets/less/bootstrap-3.1.1/forms.less create mode 100755 src/assets/less/bootstrap-3.1.1/glyphicons.less create mode 100755 src/assets/less/bootstrap-3.1.1/grid.less create mode 100755 src/assets/less/bootstrap-3.1.1/input-groups.less create mode 100755 src/assets/less/bootstrap-3.1.1/jumbotron.less create mode 100755 src/assets/less/bootstrap-3.1.1/labels.less create mode 100755 src/assets/less/bootstrap-3.1.1/list-group.less create mode 100755 src/assets/less/bootstrap-3.1.1/media.less create mode 100755 src/assets/less/bootstrap-3.1.1/mixins.less create mode 100755 src/assets/less/bootstrap-3.1.1/modals.less create mode 100755 src/assets/less/bootstrap-3.1.1/navbar.less create mode 100755 src/assets/less/bootstrap-3.1.1/navs.less create mode 100755 src/assets/less/bootstrap-3.1.1/normalize.less create mode 100755 src/assets/less/bootstrap-3.1.1/pager.less create mode 100755 src/assets/less/bootstrap-3.1.1/pagination.less create mode 100755 src/assets/less/bootstrap-3.1.1/panels.less create mode 100755 src/assets/less/bootstrap-3.1.1/popovers.less create mode 100755 src/assets/less/bootstrap-3.1.1/print.less create mode 100755 src/assets/less/bootstrap-3.1.1/progress-bars.less create mode 100755 src/assets/less/bootstrap-3.1.1/responsive-utilities.less create mode 100755 src/assets/less/bootstrap-3.1.1/scaffolding.less create mode 100755 src/assets/less/bootstrap-3.1.1/tables.less create mode 100755 src/assets/less/bootstrap-3.1.1/theme.less create mode 100755 src/assets/less/bootstrap-3.1.1/thumbnails.less create mode 100755 src/assets/less/bootstrap-3.1.1/tooltip.less create mode 100755 src/assets/less/bootstrap-3.1.1/type.less create mode 100755 src/assets/less/bootstrap-3.1.1/utilities.less create mode 100755 src/assets/less/bootstrap-3.1.1/variables.less create mode 100755 src/assets/less/bootstrap-3.1.1/wells.less 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 @@ +
+ + +
+
+

+ 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 @@

- 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 %} - + {% 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 @@ -
- -
-
-

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

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 @@
    -
  • List icons (like these)
  • +
  • List icons
  • can be used
  • -
  • to easily replace
  • -
  • default bullets in lists
  • +
  • as bullets
  • +
  • in lists

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

{% highlight html %}
    -
  • List icons (like these)
  • +
  • List icons
  • can be used
  • -
  • to replace
  • -
  • default bullets in lists
  • +
  • as bullets
  • +
  • in lists
{% 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 @@