]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
change up fonts on form elements to remove unnecessary font-family on label element...
authorMark Otto <markotto@twitter.com>
Mon, 13 Feb 2012 16:18:19 +0000 (08:18 -0800)
committerMark Otto <markotto@twitter.com>
Mon, 13 Feb 2012 16:18:19 +0000 (08:18 -0800)
docs/assets/bootstrap.zip
docs/assets/css/bootstrap.css
less/forms.less

index b38db2772fe2f36e6c51feb8acf6916df6beddd9..464f1d0d0915f153c38f4374938ac351de134676 100644 (file)
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
index e52d2f0cfd6d9d31f96e3ec850659bf851df9693..57c30ab63c49bbff75ee6379995f9e2a9a10c082 100644 (file)
@@ -530,11 +530,16 @@ input,
 button,
 select,
 textarea {
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
   font-size: 13px;
   font-weight: normal;
   line-height: 18px;
 }
+input,
+button,
+select,
+textarea {
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
 label {
   display: block;
   margin-bottom: 5px;
index 81e5bb42c77effab308b2dfeadcaea1221949858..be9dbfaa9cdcc4f5cfed5a1427ab3f9daed3a388 100644 (file)
@@ -42,7 +42,13 @@ input,
 button,
 select,
 textarea {
-  #font > .sans-serif(@baseFontSize,normal,@baseLineHeight);
+  #font > .shorthand(@baseFontSize,normal,@baseLineHeight); // Set size, weight, line-height here
+}
+input,
+button,
+select,
+textarea {
+  #font > #family > .sans-serif(); // And only set font-family here for those that need it (note the missing label element)
 }
 
 // Identify controls by their labels