FlandreScarle7/Font-Awesome
1
0
Fork 0
mirror of https://github.com/FortAwesome/Font-Awesome.git synced 2024-12-27 14:01:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

more doc tweaks

Browse Source
This commit is contained in:
davegandy 2013-05-09 18:47:02 -04:00
parent da48df5589
commit 1d0c32f2c8
8 changed files with 37 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build/_includes/examples/form-inputs.html
View File

@ -5,11 +5,11 @@
<form>
<div class="input-prepend">
<span class="add-on"><i class="icon-envelope"></i></span>
<input class="input-block-level" type="text" placeholder="Email address">
<input class="span2" type="text" placeholder="Email address">
</div>
<div class="input-prepend">
<span class="add-on"><i class="icon-key"></i></span>
<input class="input-block-level" type="password" placeholder="Password">
<input class="span2" type="password" placeholder="Password">
</div>
</form>
</div>
@ -18,11 +18,11 @@
<form>
<div class="input-prepend">
<span class="add-on"><i class="icon-envelope"></i></span>
<input class="input-block-level" type="text" placeholder="Email address">
<input class="span2" type="text" placeholder="Email address">
</div>
<div class="input-prepend">
<span class="add-on"><i class="icon-key"></i></span>
<input class="input-block-level" type="password" placeholder="Password">
<input class="span2" type="password" placeholder="Password">
</div>
</form>
{% endhighlight %}

3
build/_includes/examples/rotated-flipped.html
View File

@ -21,6 +21,9 @@
<i class="icon-shield icon-flip-horizontal"></i>&nbsp; icon-flip-horizontal<br>
<i class="icon-shield icon-flip-vertical"></i>&nbsp; icon-flip-vertical
{% endhighlight %}
<p class="alert alert-info">
<i class="icon-info-sign"></i> Rotating and flipping icons aren't yet supported in IE7.
</p>
</div>
</div>
</section>

5
build/_includes/jumbotron-slider.html
View File

@ -28,17 +28,16 @@
<div class="carousel-inner">
<div class="active item"><div><i class="icon-flag"></i></div></div>
<div class="item"><div><i class="icon-rocket"></i></div></div>
<div class="item"><div><i class="icon-crop"></i></div></div>
<div class="item"><div><i class="icon-fire-extinguisher"></i></div></div>
<div class="item"><div><i class="icon-puzzle-piece"></i></div></div>
<div class="item"><div><i class="icon-microphone"></i></div></div>
<div class="item"><div><i class="icon-shield"></i></div></div>
<div class="item"><div><i class="icon-star-half-empty"></i></div></div>
<div class="item"><div><i class="icon-envelope"></i></div></div>
<div class="item"><div><i class="icon-coffee"></i></div></div>
<div class="item"><div><i class="icon-medkit"></i></div></div>
<div class="item"><div><i class="icon-book"></i></div></div>
<div class="item"><div><i class="icon-coffee"></i></div></div>
<div class="item"><div><i class="icon-fighter-jet"></i></div></div>
<div class="item"><div><i class="icon-search"></i></div></div>
<div class="item"><div><i class="icon-beer"></i></div></div>
<div class="item"><div><i class="icon-heart-empty"></i></div></div>
<div class="item"><div><i class="icon-thumbs-up"></i></div></div>

2
build/_includes/why.html
View File

@ -33,7 +33,7 @@
Designed from scratch to be fully compatible with <a href="{{ site.bootstrap.url }}">Bootstrap {{ site.bootstrap.version }}</a>.
</div>
<div class="span4">
<h4><i class="icon-crop"></i> Design Friendly</h4>
<h4><i class="icon-desktop"></i> Desktop Friendly</h4>
To use on the desktop or for a complete set of vectors,
check out the <a href="{{ page.relative_path }}cheatsheet/">cheatsheet</a>.
</div>

8
build/assets/font-awesome/css/font-awesome-ie7.css vendored
View File

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

2
build/assets/font-awesome/css/font-awesome.css vendored
View File

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

13
build/assets/font-awesome/less/font-awesome-ie7.less vendored
View File

@ -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-"] {

10
build/assets/font-awesome/less/path.less vendored
View File

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