aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-03-10 14:36:58 -0800
committerMark Otto <[email protected]>2012-03-10 14:36:58 -0800
commit67aa00d0bbc638bc527de1c617f5a915eb5b4fcb (patch)
tree933eb2206caf57caaa2dd7a518e44f000524ce0c
parentaef230d40ad79263cbdc2214509be4daa8ec92ea (diff)
downloadbootstrap-67aa00d0bbc638bc527de1c617f5a915eb5b4fcb.tar.xz
bootstrap-67aa00d0bbc638bc527de1c617f5a915eb5b4fcb.zip
make pre font-size a percentage of @baseFontSize
-rw-r--r--docs/assets/bootstrap.zipbin54817 -> 54825 bytes
-rw-r--r--docs/assets/css/bootstrap.css2
-rw-r--r--less/code.less2
3 files changed, 2 insertions, 2 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 919209d50..e920d64a0 100644
--- a/docs/assets/bootstrap.zip
+++ b/docs/assets/bootstrap.zip
Binary files differ
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 00baa1a5f..02ab012c4 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -525,7 +525,7 @@ pre {
display: block;
padding: 8.5px;
margin: 0 0 9px;
- font-size: 12px;
+ font-size: 12.025px;
line-height: 18px;
background-color: #f5f5f5;
border: 1px solid #ccc;
diff --git a/less/code.less b/less/code.less
index c7fd032ce..075185989 100644
--- a/less/code.less
+++ b/less/code.less
@@ -25,7 +25,7 @@ pre {
display: block;
padding: (@baseLineHeight - 1) / 2;
margin: 0 0 @baseLineHeight / 2;
- font-size: 12px;
+ font-size: @baseFontSize * .925; // 13px to 12px
line-height: @baseLineHeight;
background-color: #f5f5f5;
border: 1px solid #ccc; // fallback for IE7-8