Merge branch '2.2.2-wip' of github.com:twitter/bootstrap into 2.2.2-wip

1c5b8e96 · Mark Otto · be45a821 · 1413f976 · 1c5b8e96 · 1c5b8e96
Commit 1c5b8e96 authored 12 years ago by Mark Otto
Hide whitespace changes
Inline Side-by-side

Showing

with 4 additions and 0 deletions
+4 -0
--- 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;
 }

--- 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;
  }