]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
#1715: strip code of styles when in a pre
authorMark Otto <markdotto@gmail.com>
Sun, 5 Feb 2012 06:23:20 +0000 (22:23 -0800)
committerMark Otto <markdotto@gmail.com>
Sun, 5 Feb 2012 06:23:20 +0000 (22:23 -0800)
docs/assets/bootstrap.zip
docs/assets/css/bootstrap.css
less/code.less

index 1ebcf34ce36535366247c61ed44098265d32b510..3656b6fd3c110a114d6da5046c971145c577502b 100644 (file)
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
index 459e207b7784daf32c2c0ed2561dafd6ec29c27b..d51e3d6f9536f94fbdd658af46e045e8246a7ed0 100644 (file)
@@ -494,7 +494,9 @@ pre.prettyprint {
 }
 pre code {
   padding: 0;
+  color: inherit;
   background-color: transparent;
+  border: 0;
 }
 form {
   margin: 0 0 18px;
index 0cc3db857ae4a501f602114776c41a70e3e0b9c6..e75cfa00d68ed124b1b69a585af8bfbaf2fc79f7 100644 (file)
@@ -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;
   }
 }