diff options
| author | Mark Otto <[email protected]> | 2012-02-05 01:26:44 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-02-05 01:26:44 -0800 |
| commit | 9b5b8460b4e6d5e30357aaddbef5425a6150b0bf (patch) | |
| tree | 84d7473e304829666cce645b3714b3fa37753262 /docs/base-css.html | |
| parent | 2f42f35c69da66709247c2830935479dc97061a4 (diff) | |
| parent | f922a0800b4ec46fe3aa1e31427308954e86940e (diff) | |
| download | bootstrap-9b5b8460b4e6d5e30357aaddbef5425a6150b0bf.tar.xz bootstrap-9b5b8460b4e6d5e30357aaddbef5425a6150b0bf.zip | |
Merge branch 'noahblon-master' into 2.0.1-wip
Conflicts:
docs/assets/bootstrap.zip
Diffstat (limited to 'docs/base-css.html')
| -rw-r--r-- | docs/base-css.html | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/docs/base-css.html b/docs/base-css.html index 1e9f6e8c4..7f409e019 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -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, <code>section</code> 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, <code>section</code> 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> |