aboutsummaryrefslogtreecommitdiff
path: root/less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-11-30 00:24:17 -0800
committerMark Otto <[email protected]>2012-11-30 00:24:17 -0800
commit4fd164d45bdb3bfc52119d828ed7efebc92f8339 (patch)
tree6ba2d6dc79a6bd5fa88e5f360f4707605b4bdaa6 /less
parent71d8bebfbc557c89497a1299762a3baf86334aca (diff)
downloadbootstrap-4fd164d45bdb3bfc52119d828ed7efebc92f8339.tar.xz
bootstrap-4fd164d45bdb3bfc52119d828ed7efebc92f8339.zip
consolidate font resets into scaffolding
Diffstat (limited to 'less')
-rw-r--r--less/forms.less15
-rw-r--r--less/scaffolding.less12
2 files changed, 10 insertions, 17 deletions
diff --git a/less/forms.less b/less/forms.less
index 1c3be634c..ba49f74a6 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -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;
diff --git a/less/scaffolding.less b/less/scaffolding.less
index 7c555ebfb..368a2ac01 100644
--- a/less/scaffolding.less
+++ b/less/scaffolding.less
@@ -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;
}