diff options
| author | Jacob Thornton <[email protected]> | 2012-08-20 16:13:46 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-08-20 16:13:46 -0700 |
| commit | 5d63e8e2a84468351b4c1ee6cc21f48e95ea27bf (patch) | |
| tree | 2d760c794e61c15850d14d5eee1c565ab4f9a871 /less/code.less | |
| parent | 5df1e2c00a295c45db7fa75dba333dc9464b128c (diff) | |
| parent | aa2cec6f2f706f8c1754f8bf79a8c9f094445bd8 (diff) | |
| download | bootstrap-5d63e8e2a84468351b4c1ee6cc21f48e95ea27bf.tar.xz bootstrap-5d63e8e2a84468351b4c1ee6cc21f48e95ea27bf.zip | |
fMerge branch '2.1.0-wip'
Conflicts:
docs/index.html
Diffstat (limited to 'less/code.less')
| -rw-r--r-- | less/code.less | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/less/code.less b/less/code.less index 0cae749a0..f1851a074 100644 --- a/less/code.less +++ b/less/code.less @@ -1,13 +1,14 @@ -// Code.less -// Code typography styles for the <code> and <pre> elements -// -------------------------------------------------------- +// +// Code (inline and blocK) +// -------------------------------------------------- + // Inline and block code styles code, pre { padding: 0 3px 2px; #font > #family > .monospace; - font-size: @baseFontSize - 1; + font-size: @baseFontSize - 2; color: @grayDark; .border-radius(3px); } @@ -25,7 +26,7 @@ pre { display: block; padding: (@baseLineHeight - 1) / 2; margin: 0 0 @baseLineHeight / 2; - font-size: @baseFontSize * .925; // 13px to 12px + font-size: @baseFontSize - 1; // 14px to 13px line-height: @baseLineHeight; word-break: break-all; word-wrap: break-word; |