Skip to content

B
bootstrap
Commit 1c5b8e96 authored by Mark Otto's avatar Mark Otto
Browse files
Options

Merge branch '2.2.2-wip' of github.com:twitter/bootstrap into 2.2.2-wip

parents be45a821 1413f976
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
docs/assets/css/bootstrap.css
View file @ 1c5b8e96
...@@ -993,6 +993,8 @@ pre.prettyprint { ...@@ -993,6 +993,8 @@ pre.prettyprint {
pre code { pre code {
padding: 0; padding: 0;
color: inherit; color: inherit;
white-space: pre;
white-space: pre-wrap;
background-color: transparent; background-color: transparent;
border: 0; border: 0;
} }
......
less/code.less
View file @ 1c5b8e96
...@@ -47,6 +47,8 @@ pre { ...@@ -47,6 +47,8 @@ pre {
code { code {
padding: 0; padding: 0;
color: inherit; color: inherit;
white-space: pre;
white-space: pre-wrap;
background-color: transparent; background-color: transparent;
border: 0; border: 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment