diff options
| author | Mark Otto <[email protected]> | 2013-02-13 11:28:00 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-02-13 11:28:00 -0800 |
| commit | b1e7010bfcba029180545fe0dcf4d66183ea4a71 (patch) | |
| tree | de73b313fe65b7da17d2a934a0db78525b3dfdfc | |
| parent | 1f5f23f869a971a4c4395d5170d9b991048d244f (diff) | |
| parent | 1dda3c395a338e1342f7c4bfcdc708b525d22e1d (diff) | |
| download | bootstrap-b1e7010bfcba029180545fe0dcf4d66183ea4a71.tar.xz bootstrap-b1e7010bfcba029180545fe0dcf4d66183ea4a71.zip | |
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
| -rw-r--r-- | docs/css.html | 4 | ||||
| -rw-r--r-- | docs/templates/pages/css.mustache | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/docs/css.html b/docs/css.html index ead396cac..f795602d8 100644 --- a/docs/css.html +++ b/docs/css.html @@ -2170,10 +2170,10 @@ For example, <code>&lt;section&gt;</code> should be wrapped <h5>Large button</h5> <div class="bs-docs-example"> - <a class="btn btn-large" href="#"><i class="icon-star"></i> Star</a> + <a class="btn btn-large" href="#"><i class="glyphicon-star"></i> Star</a> </div> <pre class="prettyprint linenums"> -<a class="btn btn-large" href="#"><i class="icon-star"></i> Star</a> +<a class="btn btn-large" href="#"><i class="glyphicon-star"></i> Star</a> </pre> <h5>Small button</h5> diff --git a/docs/templates/pages/css.mustache b/docs/templates/pages/css.mustache index 0471001dd..8ee3833cf 100644 --- a/docs/templates/pages/css.mustache +++ b/docs/templates/pages/css.mustache @@ -2110,10 +2110,10 @@ For example, <code>&lt;section&gt;</code> should be wrapped <h5>Large button</h5> <div class="bs-docs-example"> - <a class="btn btn-large" href="#"><i class="icon-star"></i> Star</a> + <a class="btn btn-large" href="#"><i class="glyphicon-star"></i> Star</a> </div>{{! /bs-docs-example }} <pre class="prettyprint linenums"> -<a class="btn btn-large" href="#"><i class="icon-star"></i> Star</a> +<a class="btn btn-large" href="#"><i class="glyphicon-star"></i> Star</a> </pre> <h5>Small button</h5> |