From 0462cd3d8122047fe82edc62c7f12fe39ade3f1c Mon Sep 17 00:00:00 2001
From: Zac Echola <zac.echola@so.mnscu.edu>
Date: Thu, 20 Aug 2015 10:55:15 -0500
Subject: Simplifies markup for checkbox validation states

---
 docs/components/forms.md | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

(limited to 'docs/components')

diff --git a/docs/components/forms.md b/docs/components/forms.md
index 031dc83a8..3d2764f92 100644
--- a/docs/components/forms.md
+++ b/docs/components/forms.md
@@ -561,21 +561,17 @@ Ensure that an alternative indication of state is also provided. For instance, y
   <input type="text" class="form-control form-control-error" id="inputError1">
 </div>
 
-<div class="has-success">
-  <div class="checkbox">
-    <label>
-      <input type="checkbox" id="checkboxSuccess" value="option1">
-      Checkbox with success
-    </label>
-  </div>
+<div class="checkbox has-success">
+  <label>
+    <input type="checkbox" id="checkboxSuccess" value="option1">
+    Checkbox with success
+  </label>
 </div>
-<div class="has-warning">
-  <div class="checkbox">
-    <label>
-      <input type="checkbox" id="checkboxWarning" value="option1">
-      Checkbox with warning
-    </label>
-  </div>
+<div class="checkbox has-warning">
+  <label>
+    <input type="checkbox" id="checkboxWarning" value="option1">
+    Checkbox with warning
+  </label>
 </div>
 <div class="has-danger">
   <div class="checkbox">
@@ -584,6 +580,11 @@ Ensure that an alternative indication of state is also provided. For instance, y
       Checkbox with error
     </label>
   </div>
+<div class="checkbox has-danger">
+  <label>
+    <input type="checkbox" id="checkboxError" value="option1">
+    Checkbox with error
+  </label>
 </div>
 {% endexample %}
 
-- 
cgit v1.2.3


From 54a964ae194e544a8d58b25fe377681e137cbbd6 Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@chrisrebert.com>
Date: Sat, 14 Nov 2015 19:35:45 -0800
Subject: s/error/danger/

[skip sauce]
---
 docs/components/forms.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/components')

diff --git a/docs/components/forms.md b/docs/components/forms.md
index 031dc83a8..563739fb2 100644
--- a/docs/components/forms.md
+++ b/docs/components/forms.md
@@ -557,7 +557,7 @@ Ensure that an alternative indication of state is also provided. For instance, y
   <input type="text" class="form-control form-control-warning" id="inputWarning1">
 </div>
 <div class="form-group has-danger">
-  <label class="form-control-label" for="inputError1">Input with error</label>
+  <label class="form-control-label" for="inputError1">Input with danger</label>
   <input type="text" class="form-control form-control-error" id="inputError1">
 </div>
 
-- 
cgit v1.2.3


From f712e922d1e52ef05701de913ee5719b58af4ee2 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Sat, 14 Nov 2015 19:45:35 -0800
Subject: unfuck that class name change

---
 docs/components/forms.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'docs/components')

diff --git a/docs/components/forms.md b/docs/components/forms.md
index e148c6102..d9e5b91d9 100644
--- a/docs/components/forms.md
+++ b/docs/components/forms.md
@@ -535,7 +535,7 @@ Block help text—for below inputs or for longer lines of help text—can be eas
 
 ## Validation
 
-Bootstrap includes validation styles for error, warning, and success states on form controls. To use, add `.has-warning`, `.has-danger`, or `.has-success` to the parent element. Any `.form-control-label`, `.form-control`, and `.text-help` within that element will receive the validation styles.
+Bootstrap includes validation styles for danger, warning, and success states on form controls. To use, add `.has-warning`, `.has-danger`, or `.has-success` to the parent element. Any `.form-control-label`, `.form-control`, and `.text-help` within that element will receive the validation styles.
 
 {% comment %}
 {% callout warning %}
@@ -557,8 +557,8 @@ Ensure that an alternative indication of state is also provided. For instance, y
   <input type="text" class="form-control form-control-warning" id="inputWarning1">
 </div>
 <div class="form-group has-danger">
-  <label class="form-control-label" for="inputError1">Input with danger</label>
-  <input type="text" class="form-control form-control-error" id="inputError1">
+  <label class="form-control-label" for="inputDanger1">Input with danger</label>
+  <input type="text" class="form-control form-control-danger" id="inputDanger1">
 </div>
 
 <div class="checkbox has-success">
@@ -576,14 +576,14 @@ Ensure that an alternative indication of state is also provided. For instance, y
 <div class="has-danger">
   <div class="checkbox">
     <label>
-      <input type="checkbox" id="checkboxError" value="option1">
-      Checkbox with error
+      <input type="checkbox" id="checkboxDanger" value="option1">
+      Checkbox with danger
     </label>
   </div>
 <div class="checkbox has-danger">
   <label>
-    <input type="checkbox" id="checkboxError" value="option1">
-    Checkbox with error
+    <input type="checkbox" id="checkboxDanger" value="option1">
+    Checkbox with danger
   </label>
 </div>
 {% endexample %}
-- 
cgit v1.2.3


From 9e23bbc1bce07be2a14cc3cb8e6ca4a09a030bd6 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Sat, 14 Nov 2015 19:46:03 -0800
Subject: fix broke markup

---
 docs/components/forms.md | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'docs/components')

diff --git a/docs/components/forms.md b/docs/components/forms.md
index d9e5b91d9..e274b8bb4 100644
--- a/docs/components/forms.md
+++ b/docs/components/forms.md
@@ -573,13 +573,6 @@ Ensure that an alternative indication of state is also provided. For instance, y
     Checkbox with warning
   </label>
 </div>
-<div class="has-danger">
-  <div class="checkbox">
-    <label>
-      <input type="checkbox" id="checkboxDanger" value="option1">
-      Checkbox with danger
-    </label>
-  </div>
 <div class="checkbox has-danger">
   <label>
     <input type="checkbox" id="checkboxDanger" value="option1">
-- 
cgit v1.2.3