diff options
| author | Mark Otto <[email protected]> | 2011-08-25 23:12:29 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-08-25 23:12:29 -0700 |
| commit | 8c2df3ac3ad2c4d87e0057bc76986e902cd2959b (patch) | |
| tree | 521f7f7f77a4bf067d6ad524a195ff2c104ffc3c /lib/type.less | |
| parent | dd4bb95c2db5db9bb6727147002d916cb86756e6 (diff) | |
| parent | 2d99e3f8a61ef9d4a40cd0cad109d0d89ae3c661 (diff) | |
| download | bootstrap-8c2df3ac3ad2c4d87e0057bc76986e902cd2959b.tar.xz bootstrap-8c2df3ac3ad2c4d87e0057bc76986e902cd2959b.zip | |
resolve conflicts in merging in other branch
Diffstat (limited to 'lib/type.less')
| -rw-r--r-- | lib/type.less | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/type.less b/lib/type.less index 1091d149b..7ee69f2f5 100644 --- a/lib/type.less +++ b/lib/type.less @@ -130,7 +130,7 @@ em { line-height: inherit; } .muted { - color: @grayLighter; + color: @grayLight; } // Blockquotes @@ -181,5 +181,8 @@ pre { border: 1px solid #ccc; border: 1px solid rgba(0,0,0,.15); .border-radius(3px); + white-space: pre; white-space: pre-wrap; + word-wrap: break-word; + }
\ No newline at end of file |