aboutsummaryrefslogtreecommitdiff
path: root/docs/assets
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2011-08-21 21:42:10 -0700
committerJacob Thornton <[email protected]>2011-08-21 21:42:10 -0700
commitb54dc13535ce50d26f3814a0246aae769ff45fc8 (patch)
treef55f48da03677560ff21d245c24dccfed134df0d /docs/assets
parent14b77f3a2164a5348ec8d9841ddc3ace27a64e37 (diff)
parent985ee6455a0ee86153cb8bca29f5fbf7b5dbfcf6 (diff)
downloadbootstrap-b54dc13535ce50d26f3814a0246aae769ff45fc8.tar.xz
bootstrap-b54dc13535ce50d26f3814a0246aae769ff45fc8.zip
Merge branch 'misc_css_fixes'
Conflicts: bootstrap-1.0.0.css lib/patterns.less
Diffstat (limited to 'docs/assets')
-rw-r--r--docs/assets/css/docs.css9
-rw-r--r--docs/assets/js/application.js21
2 files changed, 13 insertions, 17 deletions
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index ede141ce5..96c9ffb97 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -221,6 +221,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;
@@ -253,4 +256,10 @@ div.popover-well div.popover-menu-wrapper {
img.large-bird {
margin: 5px 0 0 310px;
opacity: .1;
+}
+
+/* Pretty Print
+-------------------------------------------------- */
+PRE.prettyprint {
+ overflow: hidden;
} \ No newline at end of file
diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js
index 0de6ca96f..3319e607d 100644
--- a/docs/assets/js/application.js
+++ b/docs/assets/js/application.js
@@ -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;
});