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

addressing #1259

Browse Source
This commit is contained in:
davegandy 2013-06-15 09:22:23 -04:00
parent bfeb7b8b19
commit dc0b9f5db4
7 changed files with 49 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
css/font-awesome.css vendored
View File

@ -244,6 +244,11 @@ a [class*=" icon-"] {
.btn.btn-large [class*=" icon-"].pull-right.icon-2x { .btn.btn-large [class*=" icon-"].pull-right.icon-2x {
margin-left: .2em; margin-left: .2em;
} }
/* Fixes alignment in nav lists */
.nav-list [class^="icon-"],
.nav-list [class*=" icon-"] {
line-height: inherit;
}
/* EXTRAS /* EXTRAS
* -------------------------- */ * -------------------------- */
/* Stacked and layered icon */ /* Stacked and layered icon */

1
css/font-awesome.min.css vendored
View File

@ -29,6 +29,7 @@ a [class^="icon-"],a [class*=" icon-"]{display:inline;}
.btn.btn-large [class^="icon-"],.btn.btn-large [class*=" icon-"]{margin-top:0;}.btn.btn-large [class^="icon-"].pull-left.icon-2x,.btn.btn-large [class*=" icon-"].pull-left.icon-2x,.btn.btn-large [class^="icon-"].pull-right.icon-2x,.btn.btn-large [class*=" icon-"].pull-right.icon-2x{margin-top:.05em;} .btn.btn-large [class^="icon-"],.btn.btn-large [class*=" icon-"]{margin-top:0;}.btn.btn-large [class^="icon-"].pull-left.icon-2x,.btn.btn-large [class*=" icon-"].pull-left.icon-2x,.btn.btn-large [class^="icon-"].pull-right.icon-2x,.btn.btn-large [class*=" icon-"].pull-right.icon-2x{margin-top:.05em;}
.btn.btn-large [class^="icon-"].pull-left.icon-2x,.btn.btn-large [class*=" icon-"].pull-left.icon-2x{margin-right:.2em;} .btn.btn-large [class^="icon-"].pull-left.icon-2x,.btn.btn-large [class*=" icon-"].pull-left.icon-2x{margin-right:.2em;}
.btn.btn-large [class^="icon-"].pull-right.icon-2x,.btn.btn-large [class*=" icon-"].pull-right.icon-2x{margin-left:.2em;} .btn.btn-large [class^="icon-"].pull-right.icon-2x,.btn.btn-large [class*=" icon-"].pull-right.icon-2x{margin-left:.2em;}
.nav-list [class^="icon-"],.nav-list [class*=" icon-"]{line-height:inherit;}
.icon-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:-35%;}.icon-stack [class^="icon-"],.icon-stack [class*=" icon-"]{display:block;text-align:center;position:absolute;width:100%;height:100%;font-size:1em;line-height:inherit;*line-height:2em;} .icon-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:-35%;}.icon-stack [class^="icon-"],.icon-stack [class*=" icon-"]{display:block;text-align:center;position:absolute;width:100%;height:100%;font-size:1em;line-height:inherit;*line-height:2em;}
.icon-stack .icon-stack-base{font-size:2em;*line-height:1em;} .icon-stack .icon-stack-base{font-size:2em;*line-height:1em;}
.icon-spin{display:inline-block;-moz-animation:spin 2s infinite linear;-o-animation:spin 2s infinite linear;-webkit-animation:spin 2s infinite linear;animation:spin 2s infinite linear;} .icon-spin{display:inline-block;-moz-animation:spin 2s infinite linear;-o-animation:spin 2s infinite linear;-webkit-animation:spin 2s infinite linear;animation:spin 2s infinite linear;}

6
less/bootstrap.less vendored
View File

@ -76,3 +76,9 @@
&.pull-right.icon-2x { margin-left: .2em; } &.pull-right.icon-2x { margin-left: .2em; }
} }
} }
/* Fixes alignment in nav lists */
.nav-list [class^="icon-"],
.nav-list [class*=" icon-"] {
line-height: inherit;
}

6
scss/_bootstrap.scss
View File

@ -76,3 +76,9 @@
&.pull-right.icon-2x { margin-left: .2em; } &.pull-right.icon-2x { margin-left: .2em; }
} }
} }
/* Fixes alignment in nav lists */
.nav-list [class^="icon-"],
.nav-list [class*=" icon-"] {
line-height: inherit;
}

6
src/assets/font-awesome/less/bootstrap.less vendored
View File

@ -76,3 +76,9 @@
&.pull-right.icon-2x { margin-left: .2em; } &.pull-right.icon-2x { margin-left: .2em; }
} }
} }
/* Fixes alignment in nav lists */
.nav-list [class^="icon-"],
.nav-list [class*=" icon-"] {
line-height: inherit;
}

6
src/assets/font-awesome/scss/_bootstrap.scss vendored
View File

@ -76,3 +76,9 @@
&.pull-right.icon-2x { margin-left: .2em; } &.pull-right.icon-2x { margin-left: .2em; }
} }
} }
/* Fixes alignment in nav lists */
.nav-list [class^="icon-"],
.nav-list [class*=" icon-"] {
line-height: inherit;
}

19
src/test.html
View File

@ -440,6 +440,25 @@ relative_path: ../
<li class="active"><a href="#examples"><i class="icon-circle icon-large"></i> Nav Item 6</a></li> <li class="active"><a href="#examples"><i class="icon-circle icon-large"></i> Nav Item 6</a></li>
<li class="active"><a href="#examples"><i class="icon-circle"></i> Nav Item 7</a></li> <li class="active"><a href="#examples"><i class="icon-circle"></i> Nav Item 7</a></li>
</ul> </ul>
<h4>Icons should be properly vertically aligned</h4>
<div class="row">
<div class="span3">
<ul class="nav nav-list">
<li>
<a href="#c1">
<i class="icon-chevron-right icon-fixed-width pull-right"></i> Overview
</a>
</li>
<li>
<a href="#c1">
Overview
<i class="icon-chevron-right icon-fixed-width pull-right"></i>
</a>
</li>
</ul>
</div>
</div>
<h3>2x, 3x, 4x icons in text <small>should have margins next to and below text</small></h3> <h3>2x, 3x, 4x icons in text <small>should have margins next to and below text</small></h3>