diff options
| author | Mark Otto <[email protected]> | 2013-06-27 18:49:05 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-06-27 18:49:05 -0700 |
| commit | 62f76ad33f5a70c21f91e729963e049547ffc391 (patch) | |
| tree | 3e611f99d09a7f658dc1e529a820aa87f7c4c557 /docs/docs.html | |
| parent | f64fe29003159669404f8f5a7a20551fec263904 (diff) | |
| parent | cb483b67589df7ac3ece33303b8ce944b3ac4b0e (diff) | |
| download | bootstrap-62f76ad33f5a70c21f91e729963e049547ffc391.tar.xz bootstrap-62f76ad33f5a70c21f91e729963e049547ffc391.zip | |
Merge branch '3.0.0-wip' into bs3_remove_icons
Conflicts:
docs/components.html
Diffstat (limited to 'docs/docs.html')
| -rw-r--r-- | docs/docs.html | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/docs/docs.html b/docs/docs.html index d0cd3b670..2690a5f5f 100644 --- a/docs/docs.html +++ b/docs/docs.html @@ -1942,26 +1942,26 @@ For example, <code><section></code> should be wrapped as inline. <form class="bs-docs-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 %} |