mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-17 19:21:23 +03:00
Code Activity

restore px to base font size var

Browse Source
This commit is contained in:
Mark Otto
2014-12-04 00:10:24 -08:00
parent c213ff820a
commit 4474630d77
8 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/css/bootstrap.css
Vendored
+1 -1
View File
@@ -340,7 +340,7 @@ td, th {
/* line 20, /Users/mdo/work/bootstrap/scss/scaffolding */ /* line 20, /Users/mdo/work/bootstrap/scss/scaffolding */
html { html {
font-size: 16 px; font-size: 16px;
-webkit-tap-highlight-color: rgba(0, 0, 0, 0); -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
} }
dist/css/bootstrap.css.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
dist/css/bootstrap.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/dist/css/bootstrap.css
Vendored
+1 -1
View File
@@ -340,7 +340,7 @@ td, th {
/* line 20, /Users/mdo/work/bootstrap/scss/scaffolding */ /* line 20, /Users/mdo/work/bootstrap/scss/scaffolding */
html { html {
font-size: 16 px; font-size: 16px;
-webkit-tap-highlight-color: rgba(0, 0, 0, 0); -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
} }
docs/dist/css/bootstrap.css.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/dist/css/bootstrap.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
scss/_scaffolding.scss
+1 -1
View File
@@ -18,7 +18,7 @@
// Body reset // Body reset
html { html {
font-size: ($font-size-root)px; font-size: $font-size-root;
-webkit-tap-highlight-color: rgba(0,0,0,0); -webkit-tap-highlight-color: rgba(0,0,0,0);
} }
scss/_variables.scss
+1 -1
View File
@@ -61,7 +61,7 @@ $font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace;
$font-family-base: $font-family-sans-serif; $font-family-base: $font-family-sans-serif;
//** Pixel value used to responsively scale all typography. Applied to the `<html>` element. //** 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. //** Sets the `<body>` and more to the root pixel value.
$font-size-base: 1rem; $font-size-base: 1rem;
$font-size-lg: 1.25rem; $font-size-lg: 1.25rem;