diff options
| author | Mark Otto <otto@github.com> | 2012-12-07 21:51:57 +0400 |
|---|---|---|
| committer | Mark Otto <otto@github.com> | 2012-12-07 21:51:57 +0400 |
| commit | 1c5b8e967e2b421503bc010d4ed3b79406ea5b7b (patch) | |
| tree | 131306a8807868cb33d2ea00c36731e0c90971bb | |
| parent | be45a821bb3387cac0944d80f7569b912cc21483 (diff) | |
| parent | 1413f976ae2693572aebfb30c5e3790142eec30c (diff) | |
Merge branch '2.2.2-wip' of github.com:twitter/bootstrap into 2.2.2-wip
| -rw-r--r-- | docs/assets/css/bootstrap.css | 2 | ||||
| -rw-r--r-- | less/code.less | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 0891964de2..30e6e40a2f 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 ea1e749ae2..266a926e73 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; } |