diff --git a/docs/base-css.html b/docs/base-css.html index 816b465c90..c8ed5fc652 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1845,11 +1845,12 @@ For example, <code><section></code> should be wrapped as inlin ================================================== -->
-

Icons by Glyphicons

+

Icons font by Glyphicons

-

Icon glyphs

-

140 icons in sprite form, available in dark gray (default) and white, provided by Glyphicons.

+

Included glyphs

+

Bootstrap comes with all 160 of Glyphicons Halflings set, all available in font formats for easy coloring, sizing, and placement.

+

Glyphicons attribution

-

Glyphicons Halflings are normally not available for free, but an arrangement between Bootstrap and the Glyphicons creators have made this possible at no cost to you as developers. As a thank you, we ask you to include an optional link back to Glyphicons whenever practical.

+

Glyphicons Halflings are normally not available for free, but an arrangement between Bootstrap and the Glyphicons creator have made this possible at no cost to you as developers. As a thank you, we ask you to include an optional link back to Glyphicons whenever practical.

How to use

-

All icons require an <i> tag with a unique class, prefixed with icon-. To use, place the following code just about anywhere:

+

Add the appropriate class to any inline element. All icon classes are prefixed with icon- for easy styling. To use, place the following code just about anywhere:

 <i class="icon-search"></i>
-

There are also styles available for inverted (white) icons, made ready with one extra class. We will specifically enforce this class on hover and active states for nav and dropdown links.

-
-<i class="icon-search icon-white"></i>
-
+

Want to change the icon color? Just change the color of the parent element.

Heads up! - When using beside strings of text, as in buttons or nav links, be sure to leave a space after the <i> tag for proper spacing. + When using beside strings of text, as in buttons or nav links, be sure to leave a space after the icon for proper spacing.

@@ -2134,6 +2154,7 @@ For example, <code><section></code> should be wrapped as inlin + diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 494086702d..bf37fa5c54 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -1782,11 +1782,12 @@ ================================================== -->
-

{{_i}}Icons by Glyphicons{{/i}}

+

{{_i}}Icons font by Glyphicons{{/i}}

-

{{_i}}Icon glyphs{{/i}}

-

{{_i}}140 icons in sprite form, available in dark gray (default) and white, provided by Glyphicons.{{/i}}

+

{{_i}}Included glyphs{{/i}}

+

{{_i}}Bootstrap comes with all 160 of Glyphicons Halflings set, all available in font formats for easy coloring, sizing, and placement.{{/i}}

+

Glyphicons attribution

-

{{_i}}Glyphicons Halflings are normally not available for free, but an arrangement between Bootstrap and the Glyphicons creators have made this possible at no cost to you as developers. As a thank you, we ask you to include an optional link back to Glyphicons whenever practical.{{/i}}

+

{{_i}}Glyphicons Halflings are normally not available for free, but an arrangement between Bootstrap and the Glyphicons creator have made this possible at no cost to you as developers. As a thank you, we ask you to include an optional link back to Glyphicons whenever practical.{{/i}}

{{_i}}How to use{{/i}}

-

{{_i}}All icons require an <i> tag with a unique class, prefixed with icon-. To use, place the following code just about anywhere:{{/i}}

+

{{_i}}Add the appropriate class to any inline element. All icon classes are prefixed with icon- for easy styling. To use, place the following code just about anywhere:{{/i}}

 <i class="icon-search"></i>
-

{{_i}}There are also styles available for inverted (white) icons, made ready with one extra class. We will specifically enforce this class on hover and active states for nav and dropdown links.{{/i}}

-
-<i class="icon-search icon-white"></i>
-
+

{{_i}}Want to change the icon color? Just change the color of the parent element.{{/i}}

{{_i}}Heads up!{{/i}} - {{_i}}When using beside strings of text, as in buttons or nav links, be sure to leave a space after the <i> tag for proper spacing.{{/i}} + {{_i}}When using beside strings of text, as in buttons or nav links, be sure to leave a space after the icon for proper spacing.{{/i}}

@@ -2071,6 +2091,7 @@ + {{! /span9 }} {{! row}} diff --git a/less/sprites.less b/less/sprites.less index e17e0a6fe5..785c841ab2 100644 --- a/less/sprites.less +++ b/less/sprites.less @@ -7,9 +7,6 @@ // and background-position. Your resulting HTML will look like // . -// For the white version of the icons, just add the .icon-white class: -// - // Import the fonts @font-face { font-family: 'Glyphicons Halflings';