mirror of
https://github.com/Hopiu/bootstrap.git
synced 2026-03-25 16:50:23 +00:00
Merge branch '2.2.2-wip' of github.com:twitter/bootstrap into 2.2.2-wip
This commit is contained in:
commit
1c5b8e967e
2 changed files with 4 additions and 0 deletions
2
docs/assets/css/bootstrap.css
vendored
2
docs/assets/css/bootstrap.css
vendored
|
|
@ -993,6 +993,8 @@ pre.prettyprint {
|
|||
pre code {
|
||||
padding: 0;
|
||||
color: inherit;
|
||||
white-space: pre;
|
||||
white-space: pre-wrap;
|
||||
background-color: transparent;
|
||||
border: 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -47,6 +47,8 @@ pre {
|
|||
code {
|
||||
padding: 0;
|
||||
color: inherit;
|
||||
white-space: pre;
|
||||
white-space: pre-wrap;
|
||||
background-color: transparent;
|
||||
border: 0;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue