diff options
| author | Jacob Thornton <[email protected]> | 2012-02-12 11:07:34 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-02-12 11:07:34 -0800 |
| commit | d7953a8f1e491d6ec5e479e26d15ae3b545fbb5f (patch) | |
| tree | 8bc5e771a8b3dad44e16aedb7ac1827ca368d952 /less/code.less | |
| parent | ed07a4d0ce0e769ef6efbd8d465670b26a0a5e37 (diff) | |
| parent | 2eedf60d6284f8eef256999d2a59dd18bcbd2b2a (diff) | |
| download | bootstrap-d7953a8f1e491d6ec5e479e26d15ae3b545fbb5f.tar.xz bootstrap-d7953a8f1e491d6ec5e479e26d15ae3b545fbb5f.zip | |
Merge branch '2.0.1-wip' of https://github.com/twitter/bootstrap into 2.0.1-wip
Conflicts:
docs/assets/bootstrap.zip
Diffstat (limited to 'less/code.less')
| -rw-r--r-- | less/code.less | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/less/code.less b/less/code.less index e75cfa00d..35a8ae6b8 100644 --- a/less/code.less +++ b/less/code.less @@ -11,12 +11,16 @@ pre { color: @grayDark; .border-radius(3px); } + +// Inline code code { padding: 3px 4px; color: #d14; background-color: #f7f7f9; border: 1px solid #e1e1e8; } + +// Blocks of code pre { display: block; padding: (@baseLineHeight - 1) / 2; @@ -44,3 +48,9 @@ pre { border: 0; } } + +// Enable scrollable blocks of code +.pre-scrollable { + max-height: 340px; + overflow-y: scroll; +}
\ No newline at end of file |