Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorJacob Thornton <jacobthornton@gmail.com>2012-02-03 11:47:22 +0400
committerJacob Thornton <jacobthornton@gmail.com>2012-02-03 11:47:22 +0400
commitf68f7870efd4e56dc1d651dc5de37b265558fce1 (patch)
tree4aa180f7e0fb8bf47aa2b41e21be7286a93af279 /docs
parent7f0a64106dee57c49777481715c28011f842437d (diff)
parent8c0b47a6a8315826a5128ec74d3479f2e070e78e (diff)
Merge pull request #1603 from mikaelbr/master
Fixed ID and for-attr in the doc forms
Diffstat (limited to 'docs')
-rw-r--r--docs/base-css.html12
-rw-r--r--docs/templates/pages/base-css.mustache12
2 files changed, 12 insertions, 12 deletions
diff --git a/docs/base-css.html b/docs/base-css.html
index a198064f81..60b6edfe13 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1014,9 +1014,9 @@ For example, &lt;code&gt;section&lt;/code&gt; 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>
@@ -1530,11 +1530,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>
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 6348097159..38dd5587ab 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -938,9 +938,9 @@
</div>
</div>
<div class="control-group warning">
- <label class="control-label" for="inputError">{{_i}}Input with warning{{/i}}</label>
+ <label class="control-label" for="inputWarning">{{_i}}Input with warning{{/i}}</label>
<div class="controls">
- <input type="text" id="inputError">
+ <input type="text" id="inputWarning">
<span class="help-inline">{{_i}}Something may have gone wrong{{/i}}</span>
</div>
</div>
@@ -952,9 +952,9 @@
</div>
</div>
<div class="control-group success">
- <label class="control-label" for="inputError">{{_i}}Input with success{{/i}}</label>
+ <label class="control-label" for="inputSuccess">{{_i}}Input with success{{/i}}</label>
<div class="controls">
- <input type="text" id="inputError">
+ <input type="text" id="inputSuccess">
<span class="help-inline">{{_i}}Woohoo!{{/i}}</span>
</div>
</div>
@@ -1454,11 +1454,11 @@
<div class="span4">
<form>
<div class="control-group">
- <label class="control-label" for="prependedInput">{{_i}}Email address{{/i}}</label>
+ <label class="control-label" for="inputIcon">{{_i}}Email address{{/i}}</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>