diff options
| author | Mark Otto <[email protected]> | 2012-02-11 00:07:05 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-02-11 00:07:05 -0800 |
| commit | 722c75d1b19fbb9ed98be0afa54f4f79c9f7ee48 (patch) | |
| tree | 31d5058ebb951d784544e50b677209eb51e63828 | |
| parent | a63663a3b6309e98068a79b863b0f77031e5035e (diff) | |
| download | bootstrap-722c75d1b19fbb9ed98be0afa54f4f79c9f7ee48.tar.xz bootstrap-722c75d1b19fbb9ed98be0afa54f4f79c9f7ee48.zip | |
update selectors for icons to include matcher for icon class in middle of class attr, remove docs mention of requiring icon-* first
| -rw-r--r-- | docs/assets/bootstrap.zip | bin | 52623 -> 52644 bytes | |||
| -rw-r--r-- | docs/assets/css/bootstrap.css | 4 | ||||
| -rw-r--r-- | docs/base-css.html | 4 | ||||
| -rw-r--r-- | docs/templates/pages/base-css.mustache | 4 | ||||
| -rw-r--r-- | less/sprites.less | 3 |
5 files changed, 4 insertions, 11 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip Binary files differindex 3b87a25c0..ce828690e 100644 --- a/docs/assets/bootstrap.zip +++ b/docs/assets/bootstrap.zip diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 9f0420b5b..d4d311b20 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -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 { diff --git a/docs/base-css.html b/docs/base-css.html index ac260bffb..c0ad882a5 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -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> diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 0be4c1e34..750957beb 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -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> diff --git a/less/sprites.less b/less/sprites.less index ce7668844..a7741661e 100644 --- a/less/sprites.less +++ b/less/sprites.less @@ -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; |