mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-05 16:42:29 +03:00
Code Activity

merge in master, resolve conflicts

Browse Source
This commit is contained in:
Mark Otto
2011-08-21 20:47:24 -07:00
parent 5cc933cccc
commit a98d2cccb8
10 changed files with 614 additions and 476 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/assets/css/docs.css
+3
View File
@@ -195,6 +195,9 @@ div.topbar-wrapper {
div.topbar-wrapper div.topbar {
position: absolute;
margin: 0 -20px;
}
div.topbar-wrapper div.topbar .fill {
padding-left: 20px;
padding-right: 20px;
-webkit-border-radius: 4px;
docs/assets/js/application.js
+4 -17
View File
@@ -42,25 +42,12 @@ $(document).ready(function(){
// Dropdown example for topbar nav
// ===============================
$("body").bind("click", function(e) {
$("ul.menu-dropdown").hide();
$('a.menu').parent("li").removeClass("open").children("ul.menu-dropdown").hide();
$("body").bind("click", function (e) {
$('a.menu').parent("li").removeClass("open");
});
$("a.menu").click(function(e) {
var $target = $(this);
var $parent = $target.parent("li");
var $siblings = $target.siblings("ul.menu-dropdown");
var $parentSiblings = $parent.siblings("li");
if ($parent.hasClass("open")) {
$parent.removeClass("open");
$siblings.hide();
} else {
$parent.addClass("open");
$siblings.show();
}
$parentSiblings.children("ul.menu-dropdown").hide();
$parentSiblings.removeClass("open");
$("a.menu").click(function (e) {
var $li = $(this).parent("li").toggleClass('open');
return false;
});