diff options
| author | Mark Otto <[email protected]> | 2013-03-14 13:25:59 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-03-14 13:25:59 -0700 |
| commit | 00169b48bd69ee0e203cfb557de99887811b924e (patch) | |
| tree | 7e35a8d20e9c6502b4f9b6b66b9acc27e7e42588 /less/code.less | |
| parent | d219b8b96479f3390f37a6d14f1ee3fc12192221 (diff) | |
| parent | 7bff231ea5263796bbe948da6aa996bac3a9136b (diff) | |
| download | bootstrap-00169b48bd69ee0e203cfb557de99887811b924e.tar.xz bootstrap-00169b48bd69ee0e203cfb557de99887811b924e.zip | |
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Conflicts:
less/grid.less
Diffstat (limited to 'less/code.less')
| -rw-r--r-- | less/code.less | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/less/code.less b/less/code.less index 1adb3efd4..c28b42fdd 100644 --- a/less/code.less +++ b/less/code.less @@ -8,7 +8,7 @@ code, pre { padding: 0 3px 2px; #font > #family > .monospace; - font-size: @font-size-base - 2; + font-size: (@font-size-base - 2); color: @grayDark; border-radius: 4px; } @@ -25,9 +25,9 @@ code { // Blocks of code pre { display: block; - padding: (@line-height-base - 1) / 2; - margin: 0 0 @line-height-base / 2; - font-size: @font-size-base - 1; // 14px to 13px + padding: ((@line-height-base - 1) / 2); + margin: 0 0 (@line-height-base / 2); + font-size: (@font-size-base - 1); // 14px to 13px line-height: @line-height-base; word-break: break-all; word-wrap: break-word; |