consolidate font resets into scaffolding

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 3d438486884c38f0f341565803c8c6c74b576acb..f49500b4e05efdbd5312066c0438b3960691ca5f 100644 (file)
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -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;

diff --git a/less/forms.less b/less/forms.less
index 1c3be634c3e51192813af5eb28137a2405440d23..ba49f74a67b04e417240b4807ef9ab8d42716d05 100644 (file)
--- 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 7c555ebfb2f544826fca12951a8799d452d70d8d..368a2ac01580fdd09eb767e16744f925f5bbf584 100644 (file)
--- 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;
 }