diff options
| author | Mark Otto <[email protected]> | 2015-01-19 14:48:12 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2015-01-19 14:48:12 -0800 |
| commit | 325748ff6860fbafaac21e3bfbaabfdb05fa71a8 (patch) | |
| tree | 0fc4e65149990e9d59029c09e24a0242ffa8a2d0 /scss/_forms.scss | |
| parent | 0964504fdafdde0ac71ab1a6f65eea1686cef9f8 (diff) | |
| parent | 4fd01b7ac130dd815e7490950ed807487b684f4a (diff) | |
| download | bootstrap-325748ff6860fbafaac21e3bfbaabfdb05fa71a8.tar.xz bootstrap-325748ff6860fbafaac21e3bfbaabfdb05fa71a8.zip | |
Merge branch 'master' into v4
Conflicts:
_config.yml
dist/css/bootstrap-theme.css
dist/css/bootstrap-theme.css.map
dist/css/bootstrap-theme.min.css
dist/css/bootstrap.css
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
dist/js/bootstrap.min.js
docs/_includes/components/thumbnails.html
docs/_includes/css/forms.html
docs/_includes/css/grid.html
docs/_includes/customizer-variables.html
docs/_includes/footer.html
docs/_includes/getting-started/download.html
docs/_includes/getting-started/template.html
docs/_includes/js/overview.html
docs/_includes/js/popovers.html
docs/_includes/js/tooltips.html
docs/assets/css/docs.min.css
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
docs/assets/js/src/customizer.js
docs/dist/css/bootstrap-theme.css
docs/dist/css/bootstrap-theme.css.map
docs/dist/css/bootstrap-theme.min.css
docs/dist/css/bootstrap.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
docs/dist/js/bootstrap.js
docs/dist/js/bootstrap.min.js
docs/examples/navbar-fixed-top/index.html
docs/examples/navbar-static-top/index.html
docs/examples/non-responsive/index.html
docs/examples/theme/index.html
grunt/configBridge.json
less/alerts.less
less/badges.less
less/jumbotron.less
less/panels.less
less/tables.less
less/theme.less
less/variables.less
package.json
scss/_button-group.scss
scss/_buttons.scss
scss/_forms.scss
Diffstat (limited to 'scss/_forms.scss')
| -rw-r--r-- | scss/_forms.scss | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/scss/_forms.scss b/scss/_forms.scss index f385c152f..60338b646 100644 --- a/scss/_forms.scss +++ b/scss/_forms.scss @@ -121,8 +121,9 @@ output { line-height: $line-height-base; color: $input-color; background-color: $input-bg; + background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214 border: 1px solid $input-border; - @include border-radius($input-border-radius); + @include border-radius($input-border-radius); // Note: This has no effect on <select>s in some browsers, due to the limited stylability of `<select>`s in CSS. @include box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; @@ -319,12 +320,27 @@ input[type="checkbox"] { .form-group-sm { @include input-size('.form-control', $input-height-sm, $padding-sm-vertical, $padding-sm-horizontal, $font-size-sm, $line-height-sm, $input-border-radius-sm); + + .form-control-static { + height: $input-height-sm; + padding: $padding-sm-vertical $padding-sm-horizontal; + font-size: $font-size-sm; + line-height: $line-height-sm; + } +} } @include input-size('.input-lg', $input-height-lg, $padding-lg-vertical, $padding-lg-horizontal, $font-size-lg, $line-height-lg, $input-border-radius-lg); .form-group-lg { @include input-size('.form-control', $input-height-lg, $padding-lg-vertical, $padding-lg-horizontal, $font-size-lg, $line-height-lg, $input-border-radius-lg); + + .form-control-static { + height: $input-height-lg; + padding: $padding-lg-vertical $padding-lg-horizontal; + font-size: $font-size-lg; + line-height: $line-height-lg; + } } |