diff options
| author | fat <[email protected]> | 2013-05-16 11:08:46 -0700 |
|---|---|---|
| committer | fat <[email protected]> | 2013-05-16 11:08:46 -0700 |
| commit | a4c16155a21c7bcad9b1d52e2141425cdb7df494 (patch) | |
| tree | 490759c71a56d0b54fb46d5ae56851074a31a992 /less/code.less | |
| parent | 14651035deda4d02a1ca02c6088c34f770f897f6 (diff) | |
| parent | f3d857773455a940fca0c8d2ef1ca26982700031 (diff) | |
| download | bootstrap-a4c16155a21c7bcad9b1d52e2141425cdb7df494.tar.xz bootstrap-a4c16155a21c7bcad9b1d52e2141425cdb7df494.zip | |
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Conflicts:
Makefile
docs/_site/assets/js/bootstrap-typeahead.js
docs/assets/js/bootstrap.min.js
docs/customize.html
docs/docs.html
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 |