aboutsummaryrefslogtreecommitdiff
path: root/bootstrap.css
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 /bootstrap.css
parentba9fcd8b57ad7974a52aecabac7c90dccda4afcb (diff)
downloadbootstrap-159c7a7fdae4a3bd929ee9cc76aaa3b509a969dc.tar.xz
bootstrap-159c7a7fdae4a3bd929ee9cc76aaa3b509a969dc.zip
remove code styling if it's in a pre tag
Diffstat (limited to 'bootstrap.css')
-rw-r--r--bootstrap.css10
1 files changed, 7 insertions, 3 deletions
diff --git a/bootstrap.css b/bootstrap.css
index b65126285..e8b9d2d53 100644
--- a/bootstrap.css
+++ b/bootstrap.css
@@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: Thu Nov 17 00:48:46 PST 2011
+ * Date: Thu Nov 17 00:52:01 PST 2011
*/
/* Reset.less
* Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
@@ -503,15 +503,15 @@ address {
}
code, pre {
padding: 0 3px 2px;
- font-family: Menlo, Monaco, Andale Mono, Courier New, monospace;
+ font-family: "Menlo", Monaco, Courier New, monospace;
font-size: 12px;
+ color: #404040;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
}
code {
background-color: #fee9cc;
- color: rgba(0, 0, 0, 0.75);
padding: 1px 3px;
}
pre {
@@ -530,6 +530,10 @@ pre {
white-space: pre-wrap;
word-break: break-all;
}
+pre code {
+ padding: 0;
+ background-color: transparent;
+}
/* Forms.less
* Base styles for various input types, form layouts, and states
* ------------------------------------------------------------- */