Merge branch 'normalize' of https://github.com/necolas/bootstrap into necolas-normalize

Conflicts:
	bootstrap.css
	bootstrap.min.css
	lib/type.less
This commit is contained in:
Mark Otto
2012-01-23 11:25:16 -08:00
7 changed files with 132 additions and 176 deletions

View File

@@ -8,17 +8,25 @@
// Make all forms have space below them
form {
margin-bottom: @baseLineHeight;
margin: 0 0 @baseLineHeight;
}
fieldset {
padding: 0;
margin: 0;
border: 0;
}
// Groups of fields with labels on top (legends)
legend {
display: block;
width: 100%;
padding: 0;
margin-bottom: @baseLineHeight * 1.5;
font-size: @baseFontSize * 1.5;
line-height: @baseLineHeight * 2;
color: @grayDark;
border: 0;
border-bottom: 1px solid #eee;
-webkit-margin-collapse: separate;
}
@@ -26,6 +34,7 @@ legend {
// Set font for forms
label,
input,
button,
select,
textarea {
#font > .sans-serif(@baseFontSize,normal,@baseLineHeight);