kotovalexarian-likes-github/twbs--bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00
Code Releases Activity

tweak small forms, small inputs; trying to equalize their rendered dimensions

Browse source
This commit is contained in:
Mark Otto 2015-06-22 16:30:31 -07:00
parent 5f20106784
commit ce9c0f0125
3 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
scss/_forms.scss
View file

@ -19,7 +19,7 @@
background-color: $input-bg; background-color: $input-bg;
// Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214. // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214.
background-image: none; 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. // 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 border-radius($input-border-radius);
@include box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); @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). // 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. // Only apply the height to textual inputs and some selcts.
&:not(textarea), // &:not(textarea),
&:not(select[size]), // &:not(select[size]),
&:not(select[multiple]) { // &:not(select[multiple]) {
height: $input-height-base; // height: $input-height-base;
} // }
// Unstyle the caret on `<select>`s in IE10+. // Unstyle the caret on `<select>`s in IE10+.
&::-ms-expand { &::-ms-expand {

6
scss/_navbar.scss
View file

@ -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-top: 0;
padding-bottom: 0; padding-bottom: 0;

2
scss/_variables.scss
View file

@ -102,7 +102,7 @@ $padding-base-horizontal: .75rem !default;
$padding-lg-vertical: .75rem !default; $padding-lg-vertical: .75rem !default;
$padding-lg-horizontal: 1.5rem !default; $padding-lg-horizontal: 1.5rem !default;
$padding-sm-vertical: .3rem !default; $padding-sm-vertical: .275rem !default;
$padding-sm-horizontal: .75rem !default; $padding-sm-horizontal: .75rem !default;
$padding-xs-vertical: .2rem !default; $padding-xs-vertical: .2rem !default;