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

consolidate font resets into scaffolding

Browse Source
This commit is contained in:
Mark Otto
2012-11-30 00:24:17 -08:00
parent 71d8bebfbc
commit 4fd164d45b
3 changed files with 19 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
docs/assets/css/bootstrap.css vendored
View File

@@ -182,11 +182,18 @@ textarea {
body { body {
margin: 0; margin: 0;
color: #333333;
background-color: #ffffff;
}
body,
input,
button,
select,
textarea {
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 14px; font-size: 14px;
line-height: 20px; line-height: 20px;
color: #333333;
background-color: #ffffff;
} }
a { a {
@@ -745,28 +752,6 @@ legend {
border-bottom: 1px solid #e5e5e5; border-bottom: 1px solid #e5e5e5;
} }
legend small {
font-size: 15px;
color: #999999;
}
label,
input,
button,
select,
textarea {
font-size: 14px;
font-weight: normal;
line-height: 20px;
}
input,
button,
select,
textarea {
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
}
label { label {
display: block; display: block;
margin-bottom: 5px; margin-bottom: 5px;

15
less/forms.less
View File

@@ -30,21 +30,6 @@ legend {
border-bottom: 1px solid #e5e5e5; border-bottom: 1px solid #e5e5e5;
} }
// Set font for forms
label,
input,
button,
select,
textarea {
#font > .shorthand(@baseFontSize,normal,@baseLineHeight); // Set size, weight, line-height here
}
input,
button,
select,
textarea {
font-family: @baseFontFamily; // And only set font-family here for those that need it (note the missing label element)
}
// Identify controls by their labels // Identify controls by their labels
label { label {
display: block; display: block;

12
less/scaffolding.less
View File

@@ -8,11 +8,19 @@
body { body {
margin: 0; margin: 0;
color: @textColor;
background-color: @bodyBackground;
}
// Reset fonts for revelant elements
body,
input,
button,
select,
textarea {
font-family: @baseFontFamily; font-family: @baseFontFamily;
font-size: @baseFontSize; font-size: @baseFontSize;
line-height: @baseLineHeight; line-height: @baseLineHeight;
color: @textColor;
background-color: @bodyBackground;
} }