mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-20 04:11:39 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:twitter/bootstrap into 1.2-wip

Browse Source 
Conflicts:
	README.md
	bootstrap-1.2.0.css
This commit is contained in:
Jacob Thornton
2011-08-30 23:37:46 -07:00
parent 4fb1c5bd4b 44b18f4911
commit 90d174a34d
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
docs/index.html
View File

@@ -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 -->