aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2011-11-17 00:52:11 -0800
committerMark Otto <[email protected]>2011-11-17 00:52:11 -0800
commit159c7a7fdae4a3bd929ee9cc76aaa3b509a969dc (patch)
tree9f15469d211856816be4eecc17ab378e84cc3691 /lib
parentba9fcd8b57ad7974a52aecabac7c90dccda4afcb (diff)
downloadbootstrap-159c7a7fdae4a3bd929ee9cc76aaa3b509a969dc.tar.xz
bootstrap-159c7a7fdae4a3bd929ee9cc76aaa3b509a969dc.zip
remove code styling if it's in a pre tag
Diffstat (limited to 'lib')
-rw-r--r--lib/type.less13
1 files changed, 10 insertions, 3 deletions
diff --git a/lib/type.less b/lib/type.less
index 421d666a4..f5b5ff272 100644
--- a/lib/type.less
+++ b/lib/type.less
@@ -179,15 +179,16 @@ address {
}
// Inline and block code styles
-code, pre {
+code,
+pre {
padding: 0 3px 2px;
- font-family: Menlo, Monaco, Andale Mono, Courier New, monospace;
+ #font > #family > .monospace;
font-size: 12px;
+ color: @grayDark;
.border-radius(3px);
}
code {
background-color: lighten(@orange, 40%);
- color: rgba(0,0,0,.75);
padding: 1px 3px;
}
pre {
@@ -203,4 +204,10 @@ pre {
white-space: pre;
white-space: pre-wrap;
word-break: break-all;
+
+ // Account for some code outputs that place code tags in pre tags
+ code {
+ padding: 0;
+ background-color: transparent;
+ }
} \ No newline at end of file