diff options
| author | Ivan Khalopik <[email protected]> | 2013-05-27 11:06:31 +0300 |
|---|---|---|
| committer | Ivan Khalopik <[email protected]> | 2013-05-27 11:06:31 +0300 |
| commit | 3285f4c3062f4a56eaed2461a3128a2e6a3ba9cc (patch) | |
| tree | 5fa0a3d3556a83cd96147da46e90ae9f361d8efc /less/code.less | |
| parent | 3c7a43a1f373d0c534476578b96a75ae2e63c985 (diff) | |
| parent | 7cbb1c0452a1d9904f7655aea78644def85b7f2e (diff) | |
| download | bootstrap-3285f4c3062f4a56eaed2461a3128a2e6a3ba9cc.tar.xz bootstrap-3285f4c3062f4a56eaed2461a3128a2e6a3ba9cc.zip | |
Merge remote-tracking branch 'bootstrap/3.0.0-wip' into 3.0.0-wip
Conflicts:
js/bootstrap-collapse.js
Diffstat (limited to 'less/code.less')
| -rw-r--r-- | less/code.less | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/less/code.less b/less/code.less index d9ddbc3a4..f1bc0a0cd 100644 --- a/less/code.less +++ b/less/code.less @@ -25,8 +25,8 @@ code { // Blocks of code pre { display: block; - padding: ((@line-height-base - 1) / 2); - margin: 0 0 (@line-height-base / 2); + padding: ((@line-height-computed - 1) / 2); + margin: 0 0 (@line-height-computed / 2); font-size: (@font-size-base - 1); // 14px to 13px line-height: @line-height-base; word-break: break-all; @@ -40,7 +40,7 @@ pre { // Make prettyprint styles more spaced out for readability &.prettyprint { - margin-bottom: @line-height-base; + margin-bottom: @line-height-computed; } // Account for some code outputs that place code tags in pre tags |