aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornickg <[email protected]>2018-04-11 05:45:38 +0000
committerMark Otto <[email protected]>2018-04-23 21:53:37 -0700
commit755fdacd40ed786b405cbf1bc59af8165642d800 (patch)
tree25a3b08712bf56cb431ba5494a74f052da366346
parent3d0d5f1247e1084d188ba036a4ecf68a03b08ebf (diff)
downloadbootstrap-755fdacd40ed786b405cbf1bc59af8165642d800.tar.xz
bootstrap-755fdacd40ed786b405cbf1bc59af8165642d800.zip
Replace reboot monospace hack with system font stack
-rw-r--r--scss/_code.scss8
-rw-r--r--scss/_reboot.scss4
2 files changed, 1 insertions, 11 deletions
diff --git a/scss/_code.scss b/scss/_code.scss
index 9de20fa0d..9b2e027f4 100644
--- a/scss/_code.scss
+++ b/scss/_code.scss
@@ -1,11 +1,3 @@
-// Inline and block code styles
-code,
-kbd,
-pre,
-samp {
- font-family: $font-family-monospace;
-}
-
// Inline code
code {
font-size: $code-font-size;
diff --git a/scss/_reboot.scss b/scss/_reboot.scss
index cfc99391e..73834226c 100644
--- a/scss/_reboot.scss
+++ b/scss/_reboot.scss
@@ -232,15 +232,13 @@ a:not([href]):not([tabindex]) {
// Code
//
-// stylelint-disable font-family-no-duplicate-names
pre,
code,
kbd,
samp {
- font-family: monospace, monospace; // Correct the inheritance and scaling of font size in all browsers.
+ font-family: $font-family-monospace;
font-size: 1em; // Correct the odd `em` font sizing in all browsers.
}
-// stylelint-enable font-family-no-duplicate-names
pre {
// Remove browser default top margin