diff options
| author | Mark Otto <[email protected]> | 2015-06-22 16:30:31 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2015-06-22 16:30:31 -0700 |
| commit | ce9c0f0125ffcebf20d993a70ca2d6348bdd8336 (patch) | |
| tree | b3acde09660f773befc3a6fddaf0ba170711b54e /scss | |
| parent | 5f20106784c443531518314a83536671e2915a90 (diff) | |
| download | bootstrap-ce9c0f0125ffcebf20d993a70ca2d6348bdd8336.tar.xz bootstrap-ce9c0f0125ffcebf20d993a70ca2d6348bdd8336.zip | |
tweak small forms, small inputs; trying to equalize their rendered dimensions
Diffstat (limited to 'scss')
| -rw-r--r-- | scss/_forms.scss | 12 | ||||
| -rw-r--r-- | scss/_navbar.scss | 6 | ||||
| -rw-r--r-- | scss/_variables.scss | 2 |
3 files changed, 11 insertions, 9 deletions
diff --git a/scss/_forms.scss b/scss/_forms.scss index 7cdf54125..1426fe793 100644 --- a/scss/_forms.scss +++ b/scss/_forms.scss @@ -19,7 +19,7 @@ background-color: $input-bg; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214. background-image: none; - border: 1px solid $input-border; + border: $border-width solid $input-border; // Note: This has no effect on <select>s in some browsers, due to the limited stylability of `<select>`s in CSS. @include border-radius($input-border-radius); @include box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); @@ -27,11 +27,11 @@ // Make inputs at least the height of their button counterpart (base line-height + padding + border). // Only apply the height to textual inputs and some selcts. - &:not(textarea), - &:not(select[size]), - &:not(select[multiple]) { - height: $input-height-base; - } + // &:not(textarea), + // &:not(select[size]), + // &:not(select[multiple]) { + // height: $input-height-base; + // } // Unstyle the caret on `<select>`s in IE10+. &::-ms-expand { diff --git a/scss/_navbar.scss b/scss/_navbar.scss index 342c8cc8c..17836899a 100644 --- a/scss/_navbar.scss +++ b/scss/_navbar.scss @@ -141,9 +141,11 @@ } -// Condensed navbar +// Small navbar +// +// Condensed dimensions for an aesthetic closer to v3's navbar. -.navbar-condensed { +.navbar-sm { padding-top: 0; padding-bottom: 0; diff --git a/scss/_variables.scss b/scss/_variables.scss index 5b8b1c55e..7615d2f0c 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -102,7 +102,7 @@ $padding-base-horizontal: .75rem !default; $padding-lg-vertical: .75rem !default; $padding-lg-horizontal: 1.5rem !default; -$padding-sm-vertical: .3rem !default; +$padding-sm-vertical: .275rem !default; $padding-sm-horizontal: .75rem !default; $padding-xs-vertical: .2rem !default; |