aboutsummaryrefslogtreecommitdiff
path: root/docs/assets/css/bootstrap.css
diff options
context:
space:
mode:
authorfat <[email protected]>2013-06-27 18:47:35 -0700
committerfat <[email protected]>2013-06-27 18:47:35 -0700
commit94761c221648c0968328bee1fc5970ad7b481bea (patch)
treef95907266adac9e8b58930da48ba25b723dfe209 /docs/assets/css/bootstrap.css
parent296b9d7293c99eaa0abda4a65f182ca104afbfdc (diff)
downloadbootstrap-94761c221648c0968328bee1fc5970ad7b481bea.tar.xz
bootstrap-94761c221648c0968328bee1fc5970ad7b481bea.zip
use collapse in dropdown js example
Diffstat (limited to 'docs/assets/css/bootstrap.css')
-rw-r--r--docs/assets/css/bootstrap.css5
1 files changed, 1 insertions, 4 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 487d7eb2f..f2aefb773 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -691,8 +691,6 @@ pre {
line-height: 1.428571429;
word-break: break-all;
word-wrap: break-word;
- white-space: pre;
- white-space: pre-wrap;
background-color: #f5f5f5;
border: 1px solid #ccc;
border: 1px solid rgba(0, 0, 0, 0.15);
@@ -706,7 +704,6 @@ pre.prettyprint {
pre code {
padding: 0;
color: inherit;
- white-space: pre;
white-space: pre-wrap;
background-color: transparent;
border: 0;
@@ -1540,7 +1537,7 @@ textarea::-webkit-input-placeholder {
// Move the options list down to align with labels
.controls > .radio:first-child,
.controls > .checkbox:first-child {
- padding-top: 5px; // has to be padding because margin collaspes
+ padding-top: 5px; // has to be padding because margin collapses
}
*/