restore px to base font size var

4474630d · Mark Otto · c213ff82 · 4474630d · 4474630d · 4474630d
Commit 4474630d authored Dec 04, 2014 by Mark Otto
8 changed files
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -340,7 +340,7 @@ td, th {

 /* line 20, /Users/mdo/work/bootstrap/scss/scaffolding */
 html {
-  font-size: 16 px;
+  font-size: 16px;

  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
 }

--- a/dist/css/bootstrap.css.map
+++ b/dist/css/bootstrap.css.map
--- a/dist/css/bootstrap.min.css
+++ b/dist/css/bootstrap.min.css
--- a/docs/dist/css/bootstrap.css
+++ b/docs/dist/css/bootstrap.css
@@ -340,7 +340,7 @@ td, th {

 /* line 20, /Users/mdo/work/bootstrap/scss/scaffolding */
 html {
-  font-size: 16 px;
+  font-size: 16px;

  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
 }

--- a/docs/dist/css/bootstrap.css.map
+++ b/docs/dist/css/bootstrap.css.map
--- a/docs/dist/css/bootstrap.min.css
+++ b/docs/dist/css/bootstrap.min.css
--- a/scss/_scaffolding.scss
+++ b/scss/_scaffolding.scss
@@ -18,7 +18,7 @@
 // Body reset

 html {
-  font-size: ($font-size-root)px;
+  font-size: $font-size-root;
  -webkit-tap-highlight-color: rgba(0,0,0,0);
 }


--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -61,7 +61,7 @@ $font-family-monospace:      Menlo, Monaco, Consolas, "Courier New", monospace;
 $font-family-base:           $font-family-sans-serif;

 //** Pixel value used to responsively scale all typography. Applied to the `<html>` element.
-$font-size-root:             16;
+$font-size-root:             16px;
 //** Sets the `<body>` and more to the root pixel value.
 $font-size-base:             1rem;
 $font-size-lg:               1.25rem;