From: Mark Otto <markdotto@gmail.com>
Date: Sun, 5 Feb 2012 06:23:20 +0000 (-0800)
Subject: #1715: strip code of styles when in a pre
X-Git-Tag: v2.0.1~1^2~68
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=468688638d69e23141ec4abda074a36e888c12c7;p=thirdparty%2Fbootstrap.git

#1715: strip code of styles when in a pre
---

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 1ebcf34ce3..3656b6fd3c 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 459e207b77..d51e3d6f95 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -494,7 +494,9 @@ pre.prettyprint {
 }
 pre code {
   padding: 0;
+  color: inherit;
   background-color: transparent;
+  border: 0;
 }
 form {
   margin: 0 0 18px;
diff --git a/less/code.less b/less/code.less
index 0cc3db857a..e75cfa00d6 100644
--- a/less/code.less
+++ b/less/code.less
@@ -39,6 +39,8 @@ pre {
   // Account for some code outputs that place code tags in pre tags
   code {
     padding: 0;
+    color: inherit;
     background-color: transparent;
+    border: 0;
   }
 }