Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bootstrap
bootstrap
Commits
4fd164d4
Commit
4fd164d4
authored
12 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
consolidate font resets into scaffolding
parent
71d8bebf
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
docs/assets/css/bootstrap.css
+9
-24
docs/assets/css/bootstrap.css
less/forms.less
+0
-15
less/forms.less
less/scaffolding.less
+10
-2
less/scaffolding.less
with
19 additions
and
41 deletions
+19
-41
docs/assets/css/bootstrap.css
+
9
-
24
View file @
4fd164d4
...
...
@@ -182,11 +182,18 @@ textarea {
body
{
margin
:
0
;
color
:
#333333
;
background-color
:
#ffffff
;
}
body
,
input
,
button
,
select
,
textarea
{
font-family
:
"Helvetica Neue"
,
Helvetica
,
Arial
,
sans-serif
;
font-size
:
14px
;
line-height
:
20px
;
color
:
#333333
;
background-color
:
#ffffff
;
}
a
{
...
...
@@ -745,28 +752,6 @@ legend {
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
{
display
:
block
;
margin-bottom
:
5px
;
...
...
This diff is collapsed.
Click to expand it.
less/forms.less
+
0
-
15
View file @
4fd164d4
...
...
@@ -30,21 +30,6 @@ legend {
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
label {
display: block;
...
...
This diff is collapsed.
Click to expand it.
less/scaffolding.less
+
10
-
2
View file @
4fd164d4
...
...
@@ -8,11 +8,19 @@
body {
margin: 0;
color: @textColor;
background-color: @bodyBackground;
}
// Reset fonts for revelant elements
body,
input,
button,
select,
textarea {
font-family: @baseFontFamily;
font-size: @baseFontSize;
line-height: @baseLineHeight;
color: @textColor;
background-color: @bodyBackground;
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment