sharpetronics/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-12-09 00:03:29 -05:00
Code Issues Projects Releases Wiki Activity

use collapse in dropdown js example

Browse Source
This commit is contained in:
fat 2013-06-27 18:47:35 -07:00
parent 296b9d7293
commit 94761c2216
2 changed files with 41 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docs/assets/css/bootstrap.css vendored
View File

@ -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
}
*/

7
docs/javascript.html
View File

@ -348,6 +348,12 @@ $('#myModal').on('hidden.bs.modal', function () {
<div class="navbar-inner">
<div class="container" style="width: auto;">
<a class="navbar-brand" href="#">Project Name</a>
<button class="navbar-toggle" type="button" data-toggle="collapse" data-target=".bs-js-navbar-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<div class="nav-collapse collapse bs-js-navbar-collapse">
<ul class="nav navbar-nav" role="navigation">
<li class="dropdown">
<a id="drop1" href="#" role="button" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
@ -382,6 +388,7 @@ $('#myModal').on('hidden.bs.modal', function () {
</ul>
</li>
</ul>
</ul>
</div>
</div>
</div> <!-- /navbar-example -->