mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-21 13:24:08 +03:00
Code Activity

Merge branch 'noahblon-master' into 2.0.1-wip

Browse Source 
Conflicts:
	docs/assets/bootstrap.zip
This commit is contained in:
Mark Otto
2012-02-05 01:26:44 -08:00
parent 2f42f35c69 f922a0800b
commit 9b5b8460b4
7 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/base-css.html
+6 -6
View File
@@ -1014,9 +1014,9 @@ For example, <code>section</code> should be wrapped as inline.
</div>
</div>
<div class="control-group warning">
<label class="control-label" for="inputError">Input with warning</label>
<label class="control-label" for="inputWarning">Input with warning</label>
<div class="controls">
<input type="text" id="inputError">
<input type="text" id="inputWarning">
<span class="help-inline">Something may have gone wrong</span>
</div>
</div>
@@ -1028,9 +1028,9 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline.
</div>
</div>
<div class="control-group success">
<label class="control-label" for="inputError">Input with success</label>
<label class="control-label" for="inputSuccess">Input with success</label>
<div class="controls">
<input type="text" id="inputError">
<input type="text" id="inputSuccess">
<span class="help-inline">Woohoo!</span>
</div>
</div>
@@ -1534,11 +1534,11 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline.
<div class="span4">
<form>
<div class="control-group">
<label class="control-label" for="prependedInput">Email address</label>
<label class="control-label" for="inputIcon">Email address</label>
<div class="controls">
<div class="input-prepend">
<span class="add-on"><i class="icon-envelope"></i></span>
<input class="span2" id="iconInput" type="text">
<input class="span2" id="inputIcon" type="text">
</div>
</div>
</div>