diff options
| author | Mark Otto <[email protected]> | 2012-11-09 10:09:04 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-11-09 10:09:04 -0800 |
| commit | 1a4ce9ba1872c06fe3107fd1330070d08706ec1c (patch) | |
| tree | 47b2d1241821a9e81a2a242c481307d5e371e516 /docs | |
| parent | 57eed7867bfd79a186ab40be09bcf60a595bdb92 (diff) | |
| parent | 54486de88c7774e83b66dd4d42885300c2692f67 (diff) | |
| download | bootstrap-1a4ce9ba1872c06fe3107fd1330070d08706ec1c.tar.xz bootstrap-1a4ce9ba1872c06fe3107fd1330070d08706ec1c.zip | |
Merge branch '2.2.2-wip' into exploratory
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/base-css.html | 2 | ||||
| -rw-r--r-- | docs/customize.html | 2 | ||||
| -rw-r--r-- | docs/templates/pages/base-css.mustache | 2 | ||||
| -rw-r--r-- | docs/templates/pages/customize.mustache | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/docs/base-css.html b/docs/base-css.html index ac99d43b2..6a1698aec 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -347,7 +347,7 @@ </pre> <h3>Unstyled</h3> - <p>Remove default the <code>list-style</code> and left padding on list items (immediate children only).</p> + <p>Remove the default <code>list-style</code> and left padding on list items (immediate children only).</p> <div class="bs-docs-example"> <ul class="list-unstyled"> <li>Lorem ipsum dolor sit amet</li> diff --git a/docs/customize.html b/docs/customize.html index ffba46c84..744cb848b 100644 --- a/docs/customize.html +++ b/docs/customize.html @@ -366,7 +366,7 @@ <label>@btnPrimaryBackground</label> <input type="text" class="span3" placeholder="@linkColor"> <label>@btnPrimaryBackgroundHighlight</label> - <input type="text" class="span3" placeholder="darken(@white, 10%);"> + <input type="text" class="span3" placeholder="darken(@white, 10%)"> </div><!-- /span --> <div class="span3"> diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index eeb7a267b..449913dc7 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -287,7 +287,7 @@ </pre> <h3>{{_i}}Unstyled{{/i}}</h3> - <p>{{_i}}Remove default the <code>list-style</code> and left padding on list items (immediate children only).{{/i}}</p> + <p>{{_i}}Remove the default <code>list-style</code> and left padding on list items (immediate children only).{{/i}}</p> <div class="bs-docs-example"> <ul class="list-unstyled"> <li>Lorem ipsum dolor sit amet</li> diff --git a/docs/templates/pages/customize.mustache b/docs/templates/pages/customize.mustache index fa420a373..54bffd786 100644 --- a/docs/templates/pages/customize.mustache +++ b/docs/templates/pages/customize.mustache @@ -298,7 +298,7 @@ <label>@btnPrimaryBackground</label> <input type="text" class="span3" placeholder="@linkColor"> <label>@btnPrimaryBackgroundHighlight</label> - <input type="text" class="span3" placeholder="darken(@white, 10%);"> + <input type="text" class="span3" placeholder="darken(@white, 10%)"> </div><!-- /span --> <div class="span3"> |