diff options
| author | Mark Otto <[email protected]> | 2013-06-21 09:11:54 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-06-21 09:11:54 -0700 |
| commit | 356100e74e474c48eade378d3a6ce8d58880379b (patch) | |
| tree | cb7e168c1779ee962de4edf48488f56ebb1bfcbb /docs | |
| parent | 2535e060a48393143e7a6c2eb93a0a5d06663801 (diff) | |
| parent | 9d43fbb57eb3ca0b1e7797365f548556600addc3 (diff) | |
| download | bootstrap-356100e74e474c48eade378d3a6ce8d58880379b.tar.xz bootstrap-356100e74e474c48eade378d3a6ce8d58880379b.zip | |
Merge pull request #8251 from acmetech/3.0.0-wip
Remove offcanvas from footer and change placeholder in css.html
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/_includes/footer.html | 4 | ||||
| -rw-r--r-- | docs/css.html | 12 |
2 files changed, 6 insertions, 10 deletions
diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html index 19a9af636..fcfc7c482 100644 --- a/docs/_includes/footer.html +++ b/docs/_includes/footer.html @@ -4,10 +4,6 @@ <script src="/assets/js/jquery.js"></script> <script src="/assets/js/bootstrap.js"></script> -<!-- Offcanvas example -================================================== --> -<script src="/assets/js/examples/bootstrap-offcanvas.js"></script> - <script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script> <script src="/assets/js/holder/holder.js"></script> diff --git a/docs/css.html b/docs/css.html index d4e7f77d2..86b9f4d65 100644 --- a/docs/css.html +++ b/docs/css.html @@ -1757,26 +1757,26 @@ For example, <code><section></code> should be wrapped as inline. <form class="bs-example" style="padding-bottom: 15px;"> <div class="row"> <div class="col-lg-2"> - <input type="text" placeholder="col-large-2"> + <input type="text" placeholder=".col-lg-2"> </div> <div class="col-lg-3"> - <input type="text" placeholder="col-large-3"> + <input type="text" placeholder=".col-lg-3"> </div> <div class="col-lg-4"> - <input type="text" placeholder="col-large-4"> + <input type="text" placeholder=".col-lg-4"> </div> </div> </form> {% highlight html %} <div class="row"> <div class="col-lg-2"> - <input type="text" placeholder="col-large-2"> + <input type="text" placeholder=".col-lg-2"> </div> <div class="col-lg-3"> - <input type="text" placeholder="col-large-3"> + <input type="text" placeholder=".col-lg-3"> </div> <div class="col-lg-4"> - <input type="text" placeholder="col-large-4"> + <input type="text" placeholder=".col-lg-4"> </div> </div> {% endhighlight %} |
