mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-20 20:00:36 +03:00
Code Activity

fix validation, run grunt dist

Browse Source
This commit is contained in:
Mark Otto
2015-03-01 14:11:22 -08:00
parent c16fee5efd
commit 517977fca4
8 changed files with 275 additions and 383 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/css/bootstrap.css
+231 -343
View File
File diff suppressed because it is too large Load Diff
dist/css/bootstrap.css.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
dist/css/bootstrap.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/assets/css/docs.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/assets/css/docs.min.css.map
+33 -32
View File
File diff suppressed because one or more lines are too long
scss/_forms.scss
+5 -4
View File
@@ -152,6 +152,7 @@ output {
fieldset[disabled] & { fieldset[disabled] & {
cursor: $cursor-disabled; cursor: $cursor-disabled;
} }
}
// Reset height for `textarea`s // Reset height for `textarea`s
textarea.form-control { textarea.form-control {
@@ -206,7 +207,7 @@ input[type="search"] {
// horizontal forms, use the predefined grid classes. // horizontal forms, use the predefined grid classes.
.form-group { .form-group {
margin-bottom: @form-group-margin-bottom; margin-bottom: $form-group-margin-bottom;
} }
@@ -298,12 +299,12 @@ input[type="checkbox"] {
// a horizontal form layout. // a horizontal form layout.
.form-control-static { .form-control-static {
min-height: ($line-height-computed + $font-size-base);
// Size it appropriately next to real form controls // Size it appropriately next to real form controls
padding-top: ($padding-base-vertical + 1); padding-top: ($padding-base-vertical + 1);
padding-bottom: ($padding-base-vertical + 1); padding-bottom: ($padding-base-vertical + 1);
// Remove default margin from `p` // Remove default margin from `p`
margin-bottom: 0; margin-bottom: 0;
min-height: (@line-height-computed + @font-size-base);
&.input-lg, &.input-lg,
&.input-sm { &.input-sm {
@@ -328,10 +329,10 @@ input[type="checkbox"] {
.form-control-static { .form-control-static {
height: $input-height-sm; height: $input-height-sm;
min-height: ($line-height-computed + $font-size-sm);
padding: $padding-sm-vertical $padding-sm-horizontal; padding: $padding-sm-vertical $padding-sm-horizontal;
font-size: $font-size-sm; font-size: $font-size-sm;
line-height: $line-height-sm; line-height: $line-height-sm;
min-height: ($line-height-computed + $font-size-sm);
} }
} }
@@ -342,10 +343,10 @@ input[type="checkbox"] {
.form-control-static { .form-control-static {
height: $input-height-lg; height: $input-height-lg;
min-height: ($line-height-computed + $font-size-lg);
padding: $padding-lg-vertical $padding-lg-horizontal; padding: $padding-lg-vertical $padding-lg-horizontal;
font-size: $font-size-lg; font-size: $font-size-lg;
line-height: $line-height-lg; line-height: $line-height-lg;
min-height: ($line-height-computed + $font-size-lg);
} }
} }
scss/_type.scss
+1 -1
View File
@@ -162,7 +162,7 @@ abbr[data-original-title] {
} }
.initialism { .initialism {
font-size: 90%; font-size: 90%;
@include text-uppercase; text-transform: uppercase;
} }
// Blockquotes // Blockquotes
scss/_variables.scss
+2
View File
@@ -213,6 +213,8 @@ $input-height-lg: (($font-size-lg * $line-height-lg) + ($padding-
//** Small `.form-control` height //** Small `.form-control` height
$input-height-sm: (($font-size-sm * $line-height-sm) + ($padding-sm-vertical * 2) + ($border-width * 2)) !default; $input-height-sm: (($font-size-sm * $line-height-sm) + ($padding-sm-vertical * 2) + ($border-width * 2)) !default;
$form-group-margin-bottom: 15px;
$legend-color: $gray-dark !default; $legend-color: $gray-dark !default;
$legend-border-color: #e5e5e5 !default; $legend-border-color: #e5e5e5 !default;