Merge pull request twbs#6151 from tierra/pre-code-white-space-fix

Fix code block white-space breaks within pre tags.
danielkop · Dec 7, 2012 · 1413f97 · 1413f97
2 parents cc6fda2 + f4466dd
commit 1413f97
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git 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
@@ -47,6 +47,8 @@ pre {
   code {
     padding: 0;
     color: inherit;
+    white-space: pre;
+    white-space: pre-wrap;
     background-color: transparent;
     border: 0;
   }