diff options
| author | Mark Otto <[email protected]> | 2014-01-05 23:19:34 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-01-05 23:19:34 -0800 |
| commit | 3e54be9ae61aa95dae7aa5719f38d6dc0216c7b1 (patch) | |
| tree | 00abaf00528eeb98617071bd7fb0eda600491b06 /docs | |
| parent | 12dacee313e49ff421fc81d5e0a6a70111c3a4af (diff) | |
| parent | 422bdc50f9a2bd1f6ec72ebb113af1a485d3465d (diff) | |
| download | bootstrap-3e54be9ae61aa95dae7aa5719f38d6dc0216c7b1.tar.xz bootstrap-3e54be9ae61aa95dae7aa5719f38d6dc0216c7b1.zip | |
Merge branch 'master' into docs_derp
Conflicts:
docs/components.html
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/components.html | 3 | ||||
| -rw-r--r-- | docs/css.html | 1 | ||||
| -rw-r--r-- | docs/getting-started.html | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/docs/components.html b/docs/components.html index 503b612f6..b81b74937 100644 --- a/docs/components.html +++ b/docs/components.html @@ -14,8 +14,7 @@ lead: "Over a dozen reusable components built to provide iconography, dropdowns, </div> <h2 id="glyphicons-glyphs">Available glyphs</h2> - <p>Includes 200 glyphs in font format from the Glyphicon Halflings set. <a href="http://glyphicons.com/">Glyphicons</a> Halflings are normally not available for free, but their creator has made them available for Bootstrap free of cost. As a thank you, we only ask that you to include a link back to <a href="http://glyphicons.com/">Glyphicons</a> whenever possible.</p> - + <p>Includes 200 glyphs in font format from the Glyphicon Halflings set. <a href="http://glyphicons.com/">Glyphicons</a> Halflings are normally not available for free, but their creator has made them available for Bootstrap free of cost. As a thank you, we only ask that you include a link back to <a href="http://glyphicons.com/">Glyphicons</a> whenever possible.</p> <div class="bs-glyphicons"> <ul class="bs-glyphicons-list"> {% for iconClassName in site.data.glyphicons %} diff --git a/docs/css.html b/docs/css.html index 424145776..b4132de92 100644 --- a/docs/css.html +++ b/docs/css.html @@ -2414,7 +2414,6 @@ For example, <code><section></code> should be wrapped as inline. <p class="bg-danger">Donec ullamcorper nulla non metus auctor fringilla.</p> </div> {% highlight html %} -<p class="bg-muted">...</p> <p class="bg-primary">...</p> <p class="bg-success">...</p> <p class="bg-info">...</p> diff --git a/docs/getting-started.html b/docs/getting-started.html index cf3ee6119..c947892f5 100644 --- a/docs/getting-started.html +++ b/docs/getting-started.html @@ -101,8 +101,8 @@ bootstrap/ └── docs/ └── examples/ {% endhighlight %} + <p>The <code>less/</code>, <code>js/</code>, and <code>fonts/</code> are the source code for our CSS, JS, and icon fonts (respectively). The <code>dist/</code> folder includes everything listed in the precompiled download section above. The <code>docs/</code> folder includes the source code for our documentation, and <code>examples/</code> of Bootstrap usage. Beyond that, any other included file provides support for packages, license information, and development.</p> </div> - <p>The <code>less/</code>, <code>js/</code>, and <code>fonts/</code> are the source code for our CSS, JS, and icon fonts (respectively). The <code>dist/</code> folder includes everything listed in the precompiled download section above. The <code>docs/</code> folder includes the source code for our documentation, and <code>examples/</code> of Bootstrap usage. Beyond that, any other included file provides support for packages, license information, and development.</p> <!-- Template |