mirror of
https://github.com/twbs/bootstrap.git
synced 2024-11-29 11:24:18 +01:00
update selectors for icons to include matcher for icon class in middle of class attr, remove docs mention of requiring icon-* first
This commit is contained in:
parent
a63663a3b6
commit
722c75d1b1
Binary file not shown.
4
docs/assets/css/bootstrap.css
vendored
4
docs/assets/css/bootstrap.css
vendored
@ -1128,7 +1128,7 @@ table .span12 {
|
||||
width: 924px;
|
||||
margin-left: 0;
|
||||
}
|
||||
[class^="icon-"] {
|
||||
[class^="icon-"], [class*=" icon-"] {
|
||||
display: inline-block;
|
||||
width: 14px;
|
||||
height: 14px;
|
||||
@ -1139,7 +1139,7 @@ table .span12 {
|
||||
background-repeat: no-repeat;
|
||||
*margin-right: .3em;
|
||||
}
|
||||
[class^="icon-"]:last-child {
|
||||
[class^="icon-"]:last-child, [class*=" icon-"]:last-child {
|
||||
*margin-left: 0;
|
||||
}
|
||||
.icon-white {
|
||||
|
@ -1515,10 +1515,6 @@ For example, <code>section</code> should be wrapped as inline.
|
||||
<i class="icon-search icon-white"></i>
|
||||
</pre>
|
||||
<p>There are 120 classes to choose from for your icons. Just add an <code><i></code> tag with the right classes and you're set. You can find the full list in <strong>sprites.less</strong> or right here in this document.</p>
|
||||
<div class="alert alert-info">
|
||||
<strong>Heads up!</strong>
|
||||
The <code>.icon-</code> class must be listed first in the class tag for proper CSS targeting.
|
||||
</div>
|
||||
</div>
|
||||
<div class="span4">
|
||||
<h3>Use cases</h3>
|
||||
|
4
docs/templates/pages/base-css.mustache
vendored
4
docs/templates/pages/base-css.mustache
vendored
@ -1439,10 +1439,6 @@
|
||||
<i class="icon-search icon-white"></i>
|
||||
</pre>
|
||||
<p>{{_i}}There are 120 classes to choose from for your icons. Just add an <code><i></code> tag with the right classes and you're set. You can find the full list in <strong>sprites.less</strong> or right here in this document.{{/i}}</p>
|
||||
<div class="alert alert-info">
|
||||
<strong>{{_i}}Heads up!{{/i}}</strong>
|
||||
{{_i}}The <code>.icon-</code> class must be listed first in the class tag for proper CSS targeting.{{/i}}
|
||||
</div>
|
||||
</div>
|
||||
<div class="span4">
|
||||
<h3>{{_i}}Use cases{{/i}}</h3>
|
||||
|
@ -14,7 +14,8 @@
|
||||
// For the white version of the icons, just add the .icon-white class:
|
||||
// <i class="icon-inbox icon-white"></i>
|
||||
|
||||
[class^="icon-"] {
|
||||
[class^="icon-"],
|
||||
[class*=" icon-"] {
|
||||
display: inline-block;
|
||||
width: 14px;
|
||||
height: 14px;
|
||||
|
Loading…
Reference in New Issue
Block a user