From: Mark Otto <otto@github.com>
Date: Sun, 31 Mar 2013 18:26:13 +0000 (-0700)
Subject: Remove the handful of rem font-sizes
X-Git-Tag: v3.0.0-rc1~515
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc16e37aaa2764bfc9ae131d6f69bd59d8ac5858;p=thirdparty%2Fbootstrap.git

Remove the handful of rem font-sizes
---

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index dadd158451..fb44326f70 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -290,7 +290,6 @@ html {
 body {
   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
   font-size: 14px;
-  font-size: 1.4rem;
   line-height: 20px;
   color: #333333;
   background-color: #ffffff;
@@ -343,10 +342,9 @@ p {
 
 .lead {
   margin-bottom: 20px;
-  font-size: 21px;
-  font-size: 2.1rem;
+  font-size: 21;
   font-weight: 200;
-  line-height: 1.3;
+  line-height: 1.4;
 }
 
 small {
@@ -3034,8 +3032,7 @@ a.list-group-item.active .list-group-item-text {
 .panel-heading {
   padding: 10px 15px;
   margin: -15px -15px 15px;
-  font-size: 16px;
-  font-size: 1.6rem;
+  font-size: 17.5;
   font-weight: 500;
   background-color: #f5f5f5;
   border-bottom: 1px solid #dddddd;
diff --git a/less/panels.less b/less/panels.less
index 6c9dd6df37..a74feccaf3 100644
--- a/less/panels.less
+++ b/less/panels.less
@@ -17,7 +17,7 @@
 .panel-heading {
   margin: -15px -15px 15px;
   padding: 10px 15px;
-  .font-size(16);
+  font-size: @font-size-base * 1.25;
   font-weight: 500;
   background-color: @panel-heading-bg;
   border-bottom: 1px solid @panel-border;
diff --git a/less/scaffolding.less b/less/scaffolding.less
index 633222ed8c..ac373af069 100644
--- a/less/scaffolding.less
+++ b/less/scaffolding.less
@@ -31,7 +31,7 @@ html {
 
 body {
   font-family: @font-family-base;
-  .font-size();
+  font-size: 14px;
   line-height: @line-height-base;
   color: @text-color;
   background-color: @body-background;
diff --git a/less/type.less b/less/type.less
index a8a1c2dec4..aac5c931a8 100644
--- a/less/type.less
+++ b/less/type.less
@@ -11,9 +11,9 @@ p {
 }
 .lead {
   margin-bottom: @line-height-base;
-  .font-size((@font-size-base * 1.5));
+  font-size: (@font-size-base * 1.5);
   font-weight: 200;
-  line-height: 1.3;
+  line-height: 1.4;
 }