mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-31 09:05:47 +02:00
Code Issues Releases Wiki 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

9
scss/_forms.scss
View File

@@ -152,6 +152,7 @@ output {
fieldset[disabled] & {
cursor: $cursor-disabled;
}
}
// Reset height for `textarea`s
textarea.form-control {
@@ -206,7 +207,7 @@ input[type="search"] {
// horizontal forms, use the predefined grid classes.
.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.
.form-control-static {
min-height: ($line-height-computed + $font-size-base);
// Size it appropriately next to real form controls
padding-top: ($padding-base-vertical + 1);
padding-bottom: ($padding-base-vertical + 1);
// Remove default margin from `p`
margin-bottom: 0;
min-height: (@line-height-computed + @font-size-base);
&.input-lg,
&.input-sm {
@@ -328,10 +329,10 @@ input[type="checkbox"] {
.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;
min-height: ($line-height-computed + $font-size-sm);
}
}
@@ -342,10 +343,10 @@ input[type="checkbox"] {
.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;
min-height: ($line-height-computed + $font-size-lg);
}
}

2
scss/_type.scss
View File

@@ -162,7 +162,7 @@ abbr[data-original-title] {
}
.initialism {
font-size: 90%;
@include text-uppercase;
text-transform: uppercase;
}
// Blockquotes

2
scss/_variables.scss
View File

@@ -213,6 +213,8 @@ $input-height-lg: (($font-size-lg * $line-height-lg) + ($padding-
//** Small `.form-control` height
$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-border-color: #e5e5e5 !default;