From: fat Date: Fri, 28 Jun 2013 01:47:35 +0000 (-0700) Subject: use collapse in dropdown js example X-Git-Tag: v3.0.0-rc1~221 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=94761c221648c0968328bee1fc5970ad7b481bea;p=thirdparty%2Fbootstrap.git use collapse in dropdown js example --- diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 487d7eb2fc..f2aefb773c 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 } */ diff --git a/docs/javascript.html b/docs/javascript.html index d1c987904b..5875926001 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -348,39 +348,46 @@ $('#myModal').on('hidden.bs.modal', function () {
Project Name - -