aboutsummaryrefslogtreecommitdiff
path: root/less/code.less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-04-18 09:37:12 -0700
committerMark Otto <[email protected]>2012-04-18 09:37:12 -0700
commit62a0f5fdcb147df8ec1084af3feba1555bed5669 (patch)
tree0729019a92b08cda0ecef3b8bd83bb2b2ce165a5 /less/code.less
parent178a9f3b519342788f653e2d5680913e36da2c4e (diff)
parent48e6d88889615e0a9b94156f0f184f787a8810b0 (diff)
downloadbootstrap-62a0f5fdcb147df8ec1084af3feba1555bed5669.tar.xz
bootstrap-62a0f5fdcb147df8ec1084af3feba1555bed5669.zip
Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
Diffstat (limited to 'less/code.less')
-rw-r--r--less/code.less8
1 files changed, 4 insertions, 4 deletions
diff --git a/less/code.less b/less/code.less
index 075185989..0cae749a0 100644
--- a/less/code.less
+++ b/less/code.less
@@ -27,14 +27,14 @@ pre {
margin: 0 0 @baseLineHeight / 2;
font-size: @baseFontSize * .925; // 13px to 12px
line-height: @baseLineHeight;
+ word-break: break-all;
+ word-wrap: break-word;
+ white-space: pre;
+ white-space: pre-wrap;
background-color: #f5f5f5;
border: 1px solid #ccc; // fallback for IE7-8
border: 1px solid rgba(0,0,0,.15);
.border-radius(4px);
- white-space: pre;
- white-space: pre-wrap;
- word-break: break-all;
- word-wrap: break-word;
// Make prettyprint styles more spaced out for readability
&.prettyprint {