Merge master

2012-12-11 16:19:08 -06:00
parent 4183060c6f e3f7365ec6
commit 906744589d
50 changed files with 1290 additions and 408 deletions
--- a/assets/css/less/bootstrap/code.less
+++ b/assets/css/less/bootstrap/code.less
@@ -19,6 +19,7 @@ code {
  color: #d14;
  background-color: #f7f7f9;
  border: 1px solid #e1e1e8;
+  white-space: nowrap;
 }

 // Blocks of code
@@ -46,6 +47,8 @@ pre {
  code {
    padding: 0;
    color: inherit;
+    white-space: pre;
+    white-space: pre-wrap;
    background-color: transparent;
    border: 0;
  }