aboutsummaryrefslogtreecommitdiff
path: root/less/code.less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-05-10 10:31:52 -0700
committerMark Otto <[email protected]>2013-05-10 10:31:52 -0700
commit8261866ff2657cc8e57d0c4ab689b742d70b4c78 (patch)
tree0c9400f03328f7ba4aafdd3b4f8b1950e148ee6e /less/code.less
parent758cb9d186e3fd9fbc94162d15a5ee0dfb1f9ef9 (diff)
parent6dee7d5abe42f726bec27e650c123fdeaed27f74 (diff)
downloadbootstrap-8261866ff2657cc8e57d0c4ab689b742d70b4c78.tar.xz
bootstrap-8261866ff2657cc8e57d0c4ab689b742d70b4c78.zip
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Diffstat (limited to 'less/code.less')
-rw-r--r--less/code.less6
1 files changed, 3 insertions, 3 deletions
diff --git a/less/code.less b/less/code.less
index d9ddbc3a4..f1bc0a0cd 100644
--- a/less/code.less
+++ b/less/code.less
@@ -25,8 +25,8 @@ code {
// Blocks of code
pre {
display: block;
- padding: ((@line-height-base - 1) / 2);
- margin: 0 0 (@line-height-base / 2);
+ padding: ((@line-height-computed - 1) / 2);
+ margin: 0 0 (@line-height-computed / 2);
font-size: (@font-size-base - 1); // 14px to 13px
line-height: @line-height-base;
word-break: break-all;
@@ -40,7 +40,7 @@ pre {
// Make prettyprint styles more spaced out for readability
&.prettyprint {
- margin-bottom: @line-height-base;
+ margin-bottom: @line-height-computed;
}
// Account for some code outputs that place code tags in pre tags