rake convert

1 files changed, 10 insertions, 2 deletions

diff --git a/assets/stylesheets/bootstrap/_forms.scss b/assets/stylesheets/bootstrap/_forms.scss
index 72d130b..cfd420c 100644
--- a/assets/stylesheets/bootstrap/_forms.scss
+++ b/assets/stylesheets/bootstrap/_forms.scss
@@ -141,11 +141,15 @@ output {
   &[disabled],
   &[readonly],
   fieldset[disabled] & {
-    cursor: $cursor-disabled;
     background-color: $input-bg-disabled;
     opacity: 1; // iOS fix for unreadable disabled content; see https://github.com/twbs/bootstrap/issues/11655
   }
 
+  &[disabled],
+  fieldset[disabled] & {
+    cursor: $cursor-disabled;
+  }
+
   // [converter] extracted textarea& to textarea.form-control
 }
 
@@ -200,7 +204,7 @@ input[type="search"] {
 // horizontal forms, use the predefined grid classes.
 
 .form-group {
-  margin-bottom: 15px;
+  margin-bottom: $form-group-margin-bottom;
 }
 
 
@@ -240,6 +244,7 @@ input[type="search"] {
 // Radios and checkboxes on same line
 .radio-inline,
 .checkbox-inline {
+  position: relative;
   display: inline-block;
   padding-left: 20px;
   margin-bottom: 0;
@@ -296,6 +301,7 @@ input[type="checkbox"] {
   padding-bottom: ($padding-base-vertical + 1);
   // Remove default margin from `p`
   margin-bottom: 0;
+  min-height: ($line-height-computed + $font-size-base);
 
   &.input-lg,
   &.input-sm {
@@ -323,6 +329,7 @@ input[type="checkbox"] {
     padding: $padding-small-vertical $padding-small-horizontal;
     font-size: $font-size-small;
     line-height: $line-height-small;
+    min-height: ($line-height-computed + $font-size-small);
   }
 }
 
@@ -336,6 +343,7 @@ input[type="checkbox"] {
     padding: $padding-large-vertical $padding-large-horizontal;
     font-size: $font-size-large;
     line-height: $line-height-large;
+    min-height: ($line-height-computed + $font-size-large);
   }
 }