From: Mark Otto <markdotto@gmail.com>
Date: Mon, 9 May 2016 06:14:48 +0000 (-0700)
Subject: update classes for inline form to new checkbox options
X-Git-Tag: v4.0.0-alpha.3~85^2~1^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5d889c385e3e057e821b06d7b06a18d5bb0f3c0;p=thirdparty%2Fbootstrap.git

update classes for inline form to new checkbox options
---

diff --git a/scss/_forms.scss b/scss/_forms.scss
index 32836182c3..24b2a20372 100644
--- a/scss/_forms.scss
+++ b/scss/_forms.scss
@@ -336,19 +336,16 @@ select.form-control-lg {
 
     // Remove default margin on radios/checkboxes that were used for stacking, and
     // then undo the floating of radios and checkboxes to match.
-    .radio,
-    .checkbox {
+    .form-check {
       display: inline-block;
       margin-top: 0;
       margin-bottom: 0;
       vertical-align: middle;
-
-      label {
-        padding-left: 0;
-      }
     }
-    .radio input[type="radio"],
-    .checkbox input[type="checkbox"] {
+    .form-check-label {
+      padding-left: 0;
+    }
+    .form-check-input {
       position: relative;
       margin-left: 0;
     }