1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-23 09:41:11 +00:00

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

This commit is contained in:
Mark Otto 2012-12-07 09:51:57 -08:00
commit 1c5b8e967e
2 changed files with 4 additions and 0 deletions

View File

@ -993,6 +993,8 @@ pre.prettyprint {
pre code {
padding: 0;
color: inherit;
white-space: pre;
white-space: pre-wrap;
background-color: transparent;
border: 0;
}

View File

@ -47,6 +47,8 @@ pre {
code {
padding: 0;
color: inherit;
white-space: pre;
white-space: pre-wrap;
background-color: transparent;
border: 0;
}