diff options
| author | Mark Otto <[email protected]> | 2013-10-20 22:55:45 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-10-20 22:55:45 -0700 |
| commit | 2eec3f919e7bd7ee847c2631ae9c53515cac1c8f (patch) | |
| tree | b9dd9c6b61fcb72aafe47dd85beac8cfb9da4fe2 /less/code.less | |
| parent | ab3d0a27b3d93eebff3852728f94ddc4fcb35199 (diff) | |
| parent | 6585c5898a47deb2df5f7db4f9ef3fe8fa1e5a4a (diff) | |
| download | bootstrap-2eec3f919e7bd7ee847c2631ae9c53515cac1c8f.tar.xz bootstrap-2eec3f919e7bd7ee847c2631ae9c53515cac1c8f.zip | |
Merge branch 'master' into pr/10656
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'less/code.less')
| -rw-r--r-- | less/code.less | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/less/code.less b/less/code.less index d6661d2b9..54ab46ac8 100644 --- a/less/code.less +++ b/less/code.less @@ -5,7 +5,9 @@ // Inline and block code styles code, -pre { +kbd, +pre, +samp { font-family: @font-family-monospace; } @@ -33,11 +35,6 @@ pre { border: 1px solid @pre-border-color; border-radius: @border-radius-base; - // Make prettyprint styles more spaced out for readability - &.prettyprint { - margin-bottom: @line-height-computed; - } - // Account for some code outputs that place code tags in pre tags code { padding: 0; @@ -45,7 +42,7 @@ pre { color: inherit; white-space: pre-wrap; background-color: transparent; - border: 0; + border-radius: 0; } } |