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

mdo · mdo · commit 1413f976ae26 · 2012-12-07T09:48:14.000-08:00
Fix code block white-space breaks within pre tags.
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;
   }

Original file line number	Diff line number	Diff line change
`@@ -993,6 +993,8 @@ pre.prettyprint {`
`993`	`993`	`pre code {`
`994`	`994`	`padding: 0;`
`995`	`995`	`color: inherit;`
	`996`	`+ white-space: pre;`
	`997`	`+ white-space: pre-wrap;`
`996`	`998`	`background-color: transparent;`
`997`	`999`	`border: 0;`
`998`	`1000`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,8 @@ pre {`
`47`	`47`	`code {`
`48`	`48`	`padding: 0;`
`49`	`49`	`color: inherit;`
	`50`	`+ white-space: pre;`
	`51`	`+ white-space: pre-wrap;`
`50`	`52`	`background-color: transparent;`
`51`	`53`	`border: 0;`
`52`	`54`	`}`