diff options
author | Gleb Mazovetskiy <glebm@google.com> | 2015-04-27 11:59:39 +0300 |
---|---|---|
committer | Gleb Mazovetskiy <glebm@google.com> | 2015-04-27 11:59:39 +0300 |
commit | f95e617f9d165c85a7d9fe658f56b53c5b756dcb (patch) | |
tree | 1a5b728c2153985adf4d60ef4c9bed7d8ee847d6 /assets/stylesheets/bootstrap/_forms.scss | |
parent | 4d879df2cb2dd4ef6dc72478a1a389d5f60a45f6 (diff) |
rake convert
Diffstat (limited to 'assets/stylesheets/bootstrap/_forms.scss')
-rw-r--r-- | assets/stylesheets/bootstrap/_forms.scss | 53 |
1 files changed, 41 insertions, 12 deletions
diff --git a/assets/stylesheets/bootstrap/_forms.scss b/assets/stylesheets/bootstrap/_forms.scss index cfd420c..a54b033 100644 --- a/assets/stylesheets/bootstrap/_forms.scss +++ b/assets/stylesheets/bootstrap/_forms.scss @@ -56,7 +56,6 @@ input[type="checkbox"] { line-height: normal; } -// Set the height of file controls to match text inputs input[type="file"] { display: block; } @@ -321,29 +320,53 @@ input[type="checkbox"] { @include input-size('.input-sm', $input-height-small, $padding-small-vertical, $padding-small-horizontal, $font-size-small, $line-height-small, $input-border-radius-small); .form-group-sm { - - @include input-size('.form-control', $input-height-small, $padding-small-vertical, $padding-small-horizontal, $font-size-small, $line-height-small, $input-border-radius-small); - - .form-control-static { + .form-control { height: $input-height-small; padding: $padding-small-vertical $padding-small-horizontal; font-size: $font-size-small; line-height: $line-height-small; + border-radius: $input-border-radius-small; + } + select.form-control { + height: $input-height-small; + line-height: $input-height-small; + } + textarea.form-control, + select[multiple].form-control { + height: auto; + } + .form-control-static { + height: $input-height-small; min-height: ($line-height-computed + $font-size-small); + padding: ($padding-small-vertical + 1) $padding-small-horizontal; + font-size: $font-size-small; + line-height: $line-height-small; } } @include input-size('.input-lg', $input-height-large, $padding-large-vertical, $padding-large-horizontal, $font-size-large, $line-height-large, $input-border-radius-large); .form-group-lg { - - @include input-size('.form-control', $input-height-large, $padding-large-vertical, $padding-large-horizontal, $font-size-large, $line-height-large, $input-border-radius-large); - - .form-control-static { + .form-control { height: $input-height-large; padding: $padding-large-vertical $padding-large-horizontal; font-size: $font-size-large; line-height: $line-height-large; + border-radius: $input-border-radius-large; + } + select.form-control { + height: $input-height-large; + line-height: $input-height-large; + } + textarea.form-control, + select[multiple].form-control { + height: auto; + } + .form-control-static { + height: $input-height-large; min-height: ($line-height-computed + $font-size-large); + padding: ($padding-large-vertical + 1) $padding-large-horizontal; + font-size: $font-size-large; + line-height: $line-height-large; } } @@ -374,12 +397,16 @@ input[type="checkbox"] { text-align: center; pointer-events: none; } -.input-lg + .form-control-feedback { +.input-lg + .form-control-feedback, +.input-group-lg + .form-control-feedback, +.form-group-lg .form-control + .form-control-feedback { width: $input-height-large; height: $input-height-large; line-height: $input-height-large; } -.input-sm + .form-control-feedback { +.input-sm + .form-control-feedback, +.input-group-sm + .form-control-feedback, +.form-group-sm .form-control + .form-control-feedback { width: $input-height-small; height: $input-height-small; line-height: $input-height-small; @@ -554,7 +581,7 @@ input[type="checkbox"] { // Reposition the icon because it's now within a grid column and columns have // `position: relative;` on them. Also accounts for the grid gutter padding. .has-feedback .form-control-feedback { - right: ($grid-gutter-width / 2); + right: floor(($grid-gutter-width / 2)); } // Form group sizes @@ -565,6 +592,7 @@ input[type="checkbox"] { @media (min-width: $screen-sm-min) { .control-label { padding-top: (($padding-large-vertical * $line-height-large) + 1); + font-size: $font-size-large; } } } @@ -572,6 +600,7 @@ input[type="checkbox"] { @media (min-width: $screen-sm-min) { .control-label { padding-top: ($padding-small-vertical + 1); + font-size: $font-size-small; } } } |