diff options
| author | Jacob Thornton <[email protected]> | 2011-08-30 23:37:46 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2011-08-30 23:37:46 -0700 |
| commit | 90d174a34d0c1c0da590fa8f21b1852e358ba0f9 (patch) | |
| tree | 4c1a1bea6a3aba0e39c1f1310f7fbe928131246f /docs | |
| parent | 4fb1c5bd4b527797183a60e752f0276b01637fd5 (diff) | |
| parent | 44b18f4911e125cc07a6d56292983b0cbfa3ae19 (diff) | |
| download | bootstrap-90d174a34d0c1c0da590fa8f21b1852e358ba0f9.tar.xz bootstrap-90d174a34d0c1c0da590fa8f21b1852e358ba0f9.zip | |
Merge branch 'master' of github.com:twitter/bootstrap into 1.2-wip
Conflicts:
README.md
bootstrap-1.2.0.css
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/index.html | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/docs/index.html b/docs/index.html index 9ec827fb1..889bc0437 100644 --- a/docs/index.html +++ b/docs/index.html @@ -656,9 +656,9 @@ </div> </div><!-- /clearfix --> <div class="clearfix error"> - <label for="xlInput">X-Large Input</label> + <label for="xlInput2">X-Large Input</label> <div class="input"> - <input class="xlarge error" id="xlInput" name="xlInput" size="30" type="text" /> + <input class="xlarge error" id="xlInput2" name="xlInput2" size="30" type="text" /> <span class="help-inline">Small snippet of help text</span> </div> </div><!-- /clearfix --> @@ -693,7 +693,7 @@ </div> </div><!-- /clearfix --> <div class="clearfix"> - <label for="xlInput">File Input</label> + <label for="fileInput">File Input</label> <div class="input"> <input class="input-file" id="fileInput" name="fileInput" type="file" /> </div> @@ -796,9 +796,9 @@ <fieldset> <legend>Example form legend</legend> <div class="clearfix"> - <label for="xlInput">X-Large Input</label> + <label for="xlInput3">X-Large Input</label> <div class="input"> - <input class="xlarge" id="xlInput" name="xlInput" size="30" type="text" /> + <input class="xlarge" id="xlInput3" name="xlInput3" size="30" type="text" /> </div> </div><!-- /clearfix --> <div class="clearfix"> @@ -817,9 +817,9 @@ <fieldset> <legend>Example form legend</legend> <div class="clearfix error"> - <label for="xlInput">X-Large Input</label> + <label for="xlInput4">X-Large Input</label> <div class="input"> - <input class="xlarge error" id="xlInput" name="xlInput" size="30" type="text" /> + <input class="xlarge error" id="xlInput4" name="xlInput4" size="30" type="text" /> <span class="help-inline">Small snippet of help text</span> </div> </div><!-- /clearfix --> |