diff options
| author | Mark Otto <[email protected]> | 2013-06-27 18:49:05 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-06-27 18:49:05 -0700 |
| commit | 62f76ad33f5a70c21f91e729963e049547ffc391 (patch) | |
| tree | 3e611f99d09a7f658dc1e529a820aa87f7c4c557 /less/code.less | |
| parent | f64fe29003159669404f8f5a7a20551fec263904 (diff) | |
| parent | cb483b67589df7ac3ece33303b8ce944b3ac4b0e (diff) | |
| download | bootstrap-62f76ad33f5a70c21f91e729963e049547ffc391.tar.xz bootstrap-62f76ad33f5a70c21f91e729963e049547ffc391.zip | |
Merge branch '3.0.0-wip' into bs3_remove_icons
Conflicts:
docs/components.html
Diffstat (limited to 'less/code.less')
| -rw-r--r-- | less/code.less | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/less/code.less b/less/code.less index f1bc0a0cd..63c255010 100644 --- a/less/code.less +++ b/less/code.less @@ -31,8 +31,6 @@ pre { line-height: @line-height-base; word-break: break-all; word-wrap: break-word; - white-space: pre; - white-space: pre-wrap; background-color: #f5f5f5; border: 1px solid #ccc; // IE8 fallback border: 1px solid rgba(0,0,0,.15); @@ -47,7 +45,6 @@ pre { code { padding: 0; color: inherit; - white-space: pre; white-space: pre-wrap; background-color: transparent; border: 0; |