diff options
| author | Mark Otto <[email protected]> | 2013-08-16 00:36:46 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-16 00:36:46 -0700 |
| commit | afdaa0e6f0488bb9fb9a1e2e5cf5d8f92cc29a3a (patch) | |
| tree | f1e15a8e540f2b3fece2dc6cd817b49a3a76a98f /less/code.less | |
| parent | afef74d03d393863048f7374a1ff9e0c4ad93bbb (diff) | |
| parent | 2fa0975956f646be627aaa4732527f6de5335a2c (diff) | |
| download | bootstrap-afdaa0e6f0488bb9fb9a1e2e5cf5d8f92cc29a3a.tar.xz bootstrap-afdaa0e6f0488bb9fb9a1e2e5cf5d8f92cc29a3a.zip | |
Merge branch '3.0.0-wip' into bs3_homepage
Diffstat (limited to 'less/code.less')
| -rw-r--r-- | less/code.less | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/less/code.less b/less/code.less index cd6132560..d6661d2b9 100644 --- a/less/code.less +++ b/less/code.less @@ -16,7 +16,7 @@ code { color: @code-color; background-color: @code-bg; white-space: nowrap; - border-radius: 4px; + border-radius: @border-radius-base; } // Blocks of code @@ -28,7 +28,7 @@ pre { line-height: @line-height-base; word-break: break-all; word-wrap: break-word; - color: @gray-dark; + color: @pre-color; background-color: @pre-bg; border: 1px solid @pre-border-color; border-radius: @border-radius-base; @@ -41,6 +41,7 @@ pre { // Account for some code outputs that place code tags in pre tags code { padding: 0; + font-size: inherit; color: inherit; white-space: pre-wrap; background-color: transparent; @@ -50,6 +51,6 @@ pre { // Enable scrollable blocks of code .pre-scrollable { - max-height: 340px; + max-height: @pre-scrollable-max-height; overflow-y: scroll; } |