diff options
| author | Mark Otto <[email protected]> | 2012-12-07 09:48:14 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-12-07 09:48:14 -0800 |
| commit | 1413f976ae2693572aebfb30c5e3790142eec30c (patch) | |
| tree | 9989fdc24d04b3186ddbabd0afdb810e14f7a28c | |
| parent | cc6fda226274c0b0e1ac27fdf36889cec9d352dc (diff) | |
| parent | f4466dd9c72da5604b1aa45c81d2d0e4cac3fad6 (diff) | |
| download | bootstrap-1413f976ae2693572aebfb30c5e3790142eec30c.tar.xz bootstrap-1413f976ae2693572aebfb30c5e3790142eec30c.zip | |
Merge pull request #6151 from tierra/pre-code-white-space-fix
Fix code block white-space breaks within pre tags.
| -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 d6ac78f26..efe455506 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 ea1e749ae..266a926e7 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; } |