From 1d0c32f2c8150b1a8eb2ca302c5a0fc53a158a4c Mon Sep 17 00:00:00 2001 From: davegandy Date: Thu, 9 May 2013 18:47:02 -0400 Subject: [PATCH] more doc tweaks --- build/_includes/examples/form-inputs.html | 8 ++++---- build/_includes/examples/rotated-flipped.html | 3 +++ build/_includes/jumbotron-slider.html | 5 ++--- build/_includes/why.html | 2 +- build/assets/font-awesome/css/font-awesome-ie7.css | 8 ++++++++ build/assets/font-awesome/css/font-awesome.css | 2 +- .../assets/font-awesome/less/font-awesome-ie7.less | 13 +++++++++++++ build/assets/font-awesome/less/path.less | 10 +++++----- 8 files changed, 37 insertions(+), 14 deletions(-) diff --git a/build/_includes/examples/form-inputs.html b/build/_includes/examples/form-inputs.html index 7b847176c..dcb39a8f2 100644 --- a/build/_includes/examples/form-inputs.html +++ b/build/_includes/examples/form-inputs.html @@ -5,11 +5,11 @@
- +
- +
@@ -18,11 +18,11 @@
- +
- +
{% endhighlight %} diff --git a/build/_includes/examples/rotated-flipped.html b/build/_includes/examples/rotated-flipped.html index 4ef40d634..cf061cd59 100644 --- a/build/_includes/examples/rotated-flipped.html +++ b/build/_includes/examples/rotated-flipped.html @@ -21,6 +21,9 @@   icon-flip-horizontal
  icon-flip-vertical {% endhighlight %} +

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

diff --git a/build/_includes/jumbotron-slider.html b/build/_includes/jumbotron-slider.html index f3111c4cc..c1dc94eb5 100644 --- a/build/_includes/jumbotron-slider.html +++ b/build/_includes/jumbotron-slider.html @@ -28,17 +28,16 @@
-
+
-
+
-
diff --git a/build/_includes/why.html b/build/_includes/why.html index 0a5f39231..6ef74f414 100644 --- a/build/_includes/why.html +++ b/build/_includes/why.html @@ -33,7 +33,7 @@ Designed from scratch to be fully compatible with Bootstrap {{ site.bootstrap.version }}.
-

Design Friendly

+

Desktop Friendly

To use on the desktop or for a complete set of vectors, check out the cheatsheet.
diff --git a/build/assets/font-awesome/css/font-awesome-ie7.css b/build/assets/font-awesome/css/font-awesome-ie7.css index 7402e8c64..c39ed623f 100644 --- a/build/assets/font-awesome/css/font-awesome-ie7.css +++ b/build/assets/font-awesome/css/font-awesome-ie7.css @@ -52,6 +52,14 @@ margin-bottom: -5px; padding-bottom: 4px; } +ul.icons-ul { + text-indent: -1em; + margin-left: 2.142857142857143em; +} +ul.icons-ul > li .icon-li { + width: 1em; + margin-right: 0; +} .btn [class^="icon-"].pull-left, .btn [class*=" icon-"].pull-left, .btn [class^="icon-"].pull-right, diff --git a/build/assets/font-awesome/css/font-awesome.css b/build/assets/font-awesome/css/font-awesome.css index 98dc7df9f..8aa81a45b 100644 --- a/build/assets/font-awesome/css/font-awesome.css +++ b/build/assets/font-awesome/css/font-awesome.css @@ -27,7 +27,7 @@ @font-face { font-family: 'FontAwesome'; src: url('../font/fontawesome-webfont.eot?v=3.1.0'); - src: url('../font/FontAwesome.otf') format('opentype'); + src: url('../font/fontawesome-webfont.eot?#iefix&v=3.1.0') format('embedded-opentype'), url('../font/fontawesome-webfont.woff?v=3.1.0') format('woff'), url('../font/fontawesome-webfont.ttf?v=3.1.0') format('truetype'); font-weight: normal; font-style: normal; } diff --git a/build/assets/font-awesome/less/font-awesome-ie7.less b/build/assets/font-awesome/less/font-awesome-ie7.less index ac0dcb6fe..8aaaee044 100644 --- a/build/assets/font-awesome/less/font-awesome-ie7.less +++ b/build/assets/font-awesome/less/font-awesome-ie7.less @@ -59,6 +59,19 @@ } } +ul.icons-ul { + text-indent: -1em; + margin-left: 30/14em; + + > li { + .icon-li { + width: 1em; + margin-right: 0; + } + } +} + + .btn { [class^="icon-"], [class*=" icon-"] { diff --git a/build/assets/font-awesome/less/path.less b/build/assets/font-awesome/less/path.less index 933120674..b080936f2 100644 --- a/build/assets/font-awesome/less/path.less +++ b/build/assets/font-awesome/less/path.less @@ -4,12 +4,12 @@ @font-face { font-family: 'FontAwesome'; src: url('@{FontAwesomePath}/fontawesome-webfont.eot?v=@{FontAwesomeVersion}'); - // src: url('@{FontAwesomePath}/fontawesome-webfont.eot?#iefix&v=@{FontAwesomeVersion}') format('embedded-opentype'), - // url('@{FontAwesomePath}/fontawesome-webfont.woff?v=@{FontAwesomeVersion}') format('woff'), - // url('@{FontAwesomePath}/fontawesome-webfont.ttf?v=@{FontAwesomeVersion}') format('truetype'); - // url('@{FontAwesomePath}/fontawesome-webfont.svg#fontawesomeregular?v=@{FontAwesomeVersion}') format('svg'); + src: url('@{FontAwesomePath}/fontawesome-webfont.eot?#iefix&v=@{FontAwesomeVersion}') format('embedded-opentype'), + url('@{FontAwesomePath}/fontawesome-webfont.woff?v=@{FontAwesomeVersion}') format('woff'), + url('@{FontAwesomePath}/fontawesome-webfont.ttf?v=@{FontAwesomeVersion}') format('truetype'); +// url('@{FontAwesomePath}/fontawesome-webfont.svg#fontawesomeregular?v=@{FontAwesomeVersion}') format('svg'); +// src: url('@{FontAwesomePath}/FontAwesome.otf') format('opentype'); - src: url('@{FontAwesomePath}/FontAwesome.otf') format('opentype'); font-weight: normal; font-style: normal;