aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Petty <[email protected]>2012-12-06 11:33:00 -0700
committerBryan Petty <[email protected]>2012-12-06 11:33:00 -0700
commitf4466dd9c72da5604b1aa45c81d2d0e4cac3fad6 (patch)
tree44f49915957b9350991f5602887d79a188d1be39
parent306c1b49147c388b7c458a939989bf33d464a69d (diff)
downloadbootstrap-f4466dd9c72da5604b1aa45c81d2d0e4cac3fad6.tar.xz
bootstrap-f4466dd9c72da5604b1aa45c81d2d0e4cac3fad6.zip
Fix code block white-space breaks within pre tags.
-rw-r--r--docs/assets/css/bootstrap.css2
-rw-r--r--less/code.less2
2 files changed, 4 insertions, 0 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 5ed924b9b..9c0e99844 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -993,6 +993,8 @@ pre.prettyprint {
pre code {
padding: 0;
color: inherit;
+ white-space: pre;
+ white-space: pre-wrap;
background-color: transparent;
border: 0;
}
diff --git a/less/code.less b/less/code.less
index ea1e749ae..266a926e7 100644
--- a/less/code.less
+++ b/less/code.less
@@ -47,6 +47,8 @@ pre {
code {
padding: 0;
color: inherit;
+ white-space: pre;
+ white-space: pre-wrap;
background-color: transparent;
border: 0;
}