From 1136f9346adb1cc9ef1b22b7c91ec1f06c225bc7 Mon Sep 17 00:00:00 2001
From: Zac Echola <zac.echola@so.mnscu.edu>
Date: Wed, 2 Jul 2014 11:32:25 -0500
Subject: [PATCH] Moves checkbox/radios into "Validation states" example.
---
docs/_includes/css/forms.html | 96 ++++++++++++++++-------------------
1 file changed, 44 insertions(+), 52 deletions(-)
diff --git a/docs/_includes/css/forms.html b/docs/_includes/css/forms.html
index c5d89c3219..7fb07ec7cc 100644
--- a/docs/_includes/css/forms.html
+++ b/docs/_includes/css/forms.html
@@ -521,6 +521,28 @@
<label class="control-label" for="inputError1">Input with error</label>
<input type="text" class="form-control" id="inputError1">
</div>
+ <div class="has-error">
+ <div class="radio">
+ <label class="checkbox">
+ <input type="checkbox" id="checkboxError" value="option1">
+ Option one is this and that—be sure to include why it's great
+ </label>
+ </div>
+ </div>
+ <div class="has-success">
+ <div class="radio">
+ <label>
+ <input type="radio" name="optionsRadios" id="radiosSuccess1" value="option1" checked>
+ Option one is this and that—be sure to include why it's great
+ </label>
+ </div>
+ <div class="radio">
+ <label>
+ <input type="radio" name="optionsRadios" id="radiosSuccess2" value="option2">
+ Option two can be something else and selecting it will deselect option one
+ </label>
+ </div>
+ </div>
</form>
</div><!-- /.bs-example -->
{% highlight html %}
@@ -536,6 +558,28 @@
<label class="control-label" for="inputError1">Input with error</label>
<input type="text" class="form-control" id="inputError1">
</div>
+<div class="has-error">
+ <div class="radio">
+ <label class="checkbox">
+ <input type="checkbox" id="checkboxError" value="option1">
+ Option one is this and that—be sure to include why it's great
+ </label>
+ </div>
+</div>
+<div class="has-success">
+ <div class="radio">
+ <label>
+ <input type="radio" name="optionsRadios" id="radiosSuccess1" value="option1" checked>
+ Option one is this and that—be sure to include why it's great
+ </label>
+ </div>
+ <div class="radio">
+ <label>
+ <input type="radio" name="optionsRadios" id="radiosSuccess2" value="option2">
+ Option two can be something else and selecting it will deselect option one
+ </label>
+ </div>
+</div>
{% endhighlight %}
<h3>With optional icons</h3>
@@ -579,58 +623,6 @@
<input type="text" class="form-control" id="inputError2">
<span class="glyphicon glyphicon-remove form-control-feedback"></span>
</div>
-{% endhighlight %}
-
- <h3>Checkboxes and radio buttons</h3>
- <div class=bs-example>
- <form role="form">
- <div class="has-error">
- <div class="radio">
- <label class="checkbox">
- <input type="checkbox" id="checkboxError" value="option1">
- Option one is this and that—be sure to include why it's great
- </label>
- </div>
- </div>
- <div class="has-success">
- <div class="radio">
- <label>
- <input type="radio" name="optionsRadios" id="radiosSuccess1" value="option1" checked>
- Option one is this and that—be sure to include why it's great
- </label>
- </div>
- <div class="radio">
- <label>
- <input type="radio" name="optionsRadios" id="radiosSuccess2" value="option2">
- Option two can be something else and selecting it will deselect option one
- </label>
- </div>
- </div>
- </form>
- </div>
-{% highlight html %}
-<div class="has-error">
- <div class="radio">
- <label class="checkbox">
- <input type="checkbox" id="checkboxError" value="option1">
- Option one is this and that—be sure to include why it's great
- </label>
- </div>
-</div>
-<div class="has-success">
- <div class="radio">
- <label>
- <input type="radio" name="optionsRadios" id="radiosSuccess1" value="option1" checked>
- Option one is this and that—be sure to include why it's great
- </label>
- </div>
- <div class="radio">
- <label>
- <input type="radio" name="optionsRadios" id="radiosSuccess2" value="option2">
- Option two can be something else and selecting it will deselect option one
- </label>
- </div>
-</div>
{% endhighlight %}
<h4>Optional icons in horizontal and inline forms</h4>
--
GitLab