From: Zac Echola <zac.echola@so.mnscu.edu>
Date: Wed, 2 Jul 2014 16:32:25 +0000 (-0500)
Subject: Moves checkbox/radios into "Validation states" example.
X-Git-Tag: v3.3.0~417^2~1^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1136f9346adb1cc9ef1b22b7c91ec1f06c225bc7;p=thirdparty%2Fbootstrap.git

Moves checkbox/radios into "Validation states" example.
---

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&mdash;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&mdash;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&mdash;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&mdash;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&mdash;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&mdash;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&mdash;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&mdash;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>