aboutsummaryrefslogtreecommitdiff
path: root/docs/css.html
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-07-15 12:00:10 -0700
committerMark Otto <[email protected]>2013-07-15 12:00:10 -0700
commitced641b1079ae9ab1b59c39ce9edf82b85b3fb37 (patch)
treec7ec7a6d4634d4d0bc5532ae22b4355af050daa3 /docs/css.html
parent6aec8f36fcb87421f29207af1c6c93448c3a38f8 (diff)
parentfb75ffca5524fa97b05400e5dad04103ce7f1946 (diff)
downloadbootstrap-ced641b1079ae9ab1b59c39ce9edf82b85b3fb37.tar.xz
bootstrap-ced641b1079ae9ab1b59c39ce9edf82b85b3fb37.zip
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Diffstat (limited to 'docs/css.html')
-rw-r--r--docs/css.html12
1 files changed, 6 insertions, 6 deletions
diff --git a/docs/css.html b/docs/css.html
index 7826742e8..e87abfbc0 100644
--- a/docs/css.html
+++ b/docs/css.html
@@ -1456,19 +1456,19 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
<p>Validation styles are applied on a per-input basis. With horizontal forms, the <code>&lt;label class="control-label"&gt;</code> will always be styled.</p>
<form class="bs-example form-horizontal">
- <div class="control-group has-warning">
+ <div class="has-warning">
<label class="control-label" for="inputWarning">Input with warning</label>
<div class="controls">
<input type="text" class="input-with-feedback" id="inputWarning">
</div>
</div>
- <div class="control-group has-error">
+ <div class="has-error">
<label class="control-label" for="inputError">Input with error</label>
<div class="controls">
<input type="text" class="input-with-feedback" id="inputError">
</div>
</div>
- <div class="control-group has-success">
+ <div class="has-success">
<label class="control-label" for="inputSuccess">Input with success</label>
<div class="controls">
<input type="text" class="input-with-feedback" id="inputSuccess">
@@ -1476,19 +1476,19 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
</div>
</form>
{% highlight html %}
-<div class="control-group has-warning">
+<div class="has-warning">
<label class="control-label" for="inputWarning">Input with warning</label>
<div class="controls">
<input type="text" class="input-with-feedback" id="inputWarning">
</div>
</div>
-<div class="control-group has-error">
+<div class="has-error">
<label class="control-label" for="inputError">Input with error</label>
<div class="controls">
<input type="text" class="input-with-feedback" id="inputError">
</div>
</div>
-<div class="control-group has-success">
+<div class="has-success">
<label class="control-label" for="inputSuccess">Input with success</label>
<div class="controls">
<input type="text" class="input-with-feedback" id="inputSuccess">