remove code styling if it's in a pre tag

3 files changed, 20 insertions, 9 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
  * ------------------------------------------------------------- */
diff --git a/bootstrap.min.css b/bootstrap.min.css
index b71f2c74f..832d50ff8 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -87,9 +87,9 @@ blockquote{margin-bottom:18px;border-left:5px solid #eee;padding-left:15px;}bloc
 blockquote small{display:block;line-height:18px;color:#bfbfbf;}blockquote small:before{content:'\2014 \00A0';}
 blockquote.pull-right{float:right;}blockquote.pull-right p,blockquote.pull-right small{text-align:right;}
 address{display:block;line-height:18px;margin-bottom:18px;}
-code,pre{padding:0 3px 2px;font-family:Menlo, Monaco, Andale Mono, Courier New, monospace;font-size:12px;-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{background-color:#f5f5f5;display:block;padding:8.5px;margin:0 0 9px;line-height:18px;font-size:12px;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;white-space:pre;white-space:pre-wrap;word-break:break-all;}
+code,pre{padding:0 3px 2px;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;padding:1px 3px;}
+pre{background-color:#f5f5f5;display:block;padding:8.5px;margin:0 0 9px;line-height:18px;font-size:12px;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;white-space:pre;white-space:pre-wrap;word-break:break-all;}pre code{padding:0;background-color:transparent;}
 form{margin-bottom:18px;}
 legend{display:block;width:100%;margin-bottom:27px;font-size:19.5px;line-height:36px;color:#404040;border-bottom:1px solid #eee;}
 label,input,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:normal;font-weight:13px;line-height:18px;}
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