mirror of
https://github.com/tenrok/bootstrap.git
synced 2026-06-14 18:42:30 +03:00
Merge branch '2.2.2-wip' of github.com:twitter/bootstrap into 2.2.2-wip
This commit is contained in:
Vendored
+2
@@ -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;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user