Skip to content

Commit f68f787

Browse files
committed
Merge pull request twbs#1603 from mikaelbr/master
Fixed ID and for-attr in the doc forms
2 parents 7f0a641 + 8c0b47a commit f68f787

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

docs/base-css.html

+6-6
Original file line numberDiff line numberDiff line change
@@ -1014,9 +1014,9 @@ <h3>New defaults with v2.0</h3>
10141014
</div>
10151015
</div>
10161016
<div class="control-group warning">
1017-
<label class="control-label" for="inputError">Input with warning</label>
1017+
<label class="control-label" for="inputWarning">Input with warning</label>
10181018
<div class="controls">
1019-
<input type="text" id="inputError">
1019+
<input type="text" id="inputWarning">
10201020
<span class="help-inline">Something may have gone wrong</span>
10211021
</div>
10221022
</div>
@@ -1028,9 +1028,9 @@ <h3>New defaults with v2.0</h3>
10281028
</div>
10291029
</div>
10301030
<div class="control-group success">
1031-
<label class="control-label" for="inputError">Input with success</label>
1031+
<label class="control-label" for="inputSuccess">Input with success</label>
10321032
<div class="controls">
1033-
<input type="text" id="inputError">
1033+
<input type="text" id="inputSuccess">
10341034
<span class="help-inline">Woohoo!</span>
10351035
</div>
10361036
</div>
@@ -1530,11 +1530,11 @@ <h3>Examples</h3>
15301530
<div class="span4">
15311531
<form>
15321532
<div class="control-group">
1533-
<label class="control-label" for="prependedInput">Email address</label>
1533+
<label class="control-label" for="inputIcon">Email address</label>
15341534
<div class="controls">
15351535
<div class="input-prepend">
15361536
<span class="add-on"><i class="icon-envelope"></i></span>
1537-
<input class="span2" id="iconInput" type="text">
1537+
<input class="span2" id="inputIcon" type="text">
15381538
</div>
15391539
</div>
15401540
</div>

docs/templates/pages/base-css.mustache

+6-6
Original file line numberDiff line numberDiff line change
@@ -938,9 +938,9 @@
938938
</div>
939939
</div>
940940
<div class="control-group warning">
941-
<label class="control-label" for="inputError">{{_i}}Input with warning{{/i}}</label>
941+
<label class="control-label" for="inputWarning">{{_i}}Input with warning{{/i}}</label>
942942
<div class="controls">
943-
<input type="text" id="inputError">
943+
<input type="text" id="inputWarning">
944944
<span class="help-inline">{{_i}}Something may have gone wrong{{/i}}</span>
945945
</div>
946946
</div>
@@ -952,9 +952,9 @@
952952
</div>
953953
</div>
954954
<div class="control-group success">
955-
<label class="control-label" for="inputError">{{_i}}Input with success{{/i}}</label>
955+
<label class="control-label" for="inputSuccess">{{_i}}Input with success{{/i}}</label>
956956
<div class="controls">
957-
<input type="text" id="inputError">
957+
<input type="text" id="inputSuccess">
958958
<span class="help-inline">{{_i}}Woohoo!{{/i}}</span>
959959
</div>
960960
</div>
@@ -1454,11 +1454,11 @@
14541454
<div class="span4">
14551455
<form>
14561456
<div class="control-group">
1457-
<label class="control-label" for="prependedInput">{{_i}}Email address{{/i}}</label>
1457+
<label class="control-label" for="inputIcon">{{_i}}Email address{{/i}}</label>
14581458
<div class="controls">
14591459
<div class="input-prepend">
14601460
<span class="add-on"><i class="icon-envelope"></i></span>
1461-
<input class="span2" id="iconInput" type="text">
1461+
<input class="span2" id="inputIcon" type="text">
14621462
</div>
14631463
</div>
14641464
</div>

0 commit comments

Comments
 (0)