app/frameworks/twitter/bootstrap/forms.less in less-rails-bootstrap-3.3.2.0 vs app/frameworks/twitter/bootstrap/forms.less in less-rails-bootstrap-3.3.4.0

- old
+ new

@@ -139,15 +139,19 @@ // disabled if the fieldset is disabled. Due to implementation difficulty, we // don't honor that edge case; we style them as disabled anyway. &[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; + } + // Reset height for `textarea`s textarea& { height: auto; } } @@ -196,11 +200,11 @@ // // Designed to help with the organization and spacing of vertical forms. For // horizontal forms, use the predefined grid classes. .form-group { - margin-bottom: 15px; + margin-bottom: @form-group-margin-bottom; } // Checkboxes and radios // @@ -236,10 +240,11 @@ } // Radios and checkboxes on same line .radio-inline, .checkbox-inline { + position: relative; display: inline-block; padding-left: 20px; margin-bottom: 0; vertical-align: middle; font-weight: normal; @@ -292,10 +297,11 @@ // Size it appropriately next to real form controls padding-top: (@padding-base-vertical + 1); 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 { padding-left: 0; padding-right: 0; @@ -321,10 +327,11 @@ .form-control-static { height: @input-height-small; 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); } } .input-lg { .input-size(@input-height-large; @padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @input-border-radius-large); @@ -336,9 +343,10 @@ .form-control-static { height: @input-height-large; 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); } } // Form control feedback states