mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-30 16:50:00 +02:00
Code Issues Releases Wiki Activity

New form control sizing, new navbar condensed variation, update nav and navbar spacing

Browse Source
This commit is contained in:
Mark Otto
2015-04-18 18:12:10 -07:00
parent 7e86bfd9ac
commit 8f94078da8
14 changed files with 275 additions and 382 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
scss/_forms.scss
View File

@@ -228,34 +228,50 @@ input[type="checkbox"] {
// The `.form-group-* form-control` variations are sadly duplicated to avoid the
// issue documented in https://github.com/twbs/bootstrap/issues/15074.
@include input-size('.input-sm', $input-height-sm, $padding-sm-vertical, $padding-sm-horizontal, $font-size-sm, $line-height-sm, $input-border-radius-sm);
.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;
min-height: ($line-height-computed + $font-size-sm);
padding: $padding-sm-vertical $padding-sm-horizontal;
font-size: $font-size-sm;
line-height: $line-height-sm;
}
.form-control-sm {
height: $input-height-sm;
padding: $padding-sm-vertical $padding-sm-horizontal;
font-size: $font-size-sm;
line-height: $line-height-sm;
border-radius: $input-border-radius-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;
min-height: ($line-height-computed + $font-size-lg);
padding: $padding-lg-vertical $padding-lg-horizontal;
font-size: $font-size-lg;
line-height: $line-height-lg;
}
.form-control-lg {
height: $input-height-lg;
padding: $padding-lg-vertical $padding-lg-horizontal;
font-size: $font-size-lg;
line-height: $line-height-lg;
border-radius: $input-border-radius-lg;
}
// @include input-size('.input-sm', $input-height-sm, $padding-sm-vertical, $padding-sm-horizontal, $font-size-sm, $line-height-sm, $input-border-radius-sm);
// .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;
// min-height: ($line-height-computed + $font-size-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;
// min-height: ($line-height-computed + $font-size-lg);
// padding: $padding-lg-vertical $padding-lg-horizontal;
// font-size: $font-size-lg;
// line-height: $line-height-lg;
// }
// }
// Form control feedback states
//