aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2011-08-26 20:38:23 -0700
committerMark Otto <[email protected]>2011-08-26 20:38:23 -0700
commit4f67e135dc2a8ad7a7b3d8946cc7a857a34881a0 (patch)
tree42faa86f8b0fd63558f9465fe5cc2328a2e6ed49 /docs
parentb9c9f1d8d616bece3240aa8c3c78873947c7d88f (diff)
downloadbootstrap-4f67e135dc2a8ad7a7b3d8946cc7a857a34881a0.tar.xz
bootstrap-4f67e135dc2a8ad7a7b3d8946cc7a857a34881a0.zip
adding dropdowns to tabs by refactoring the shizzzz out of them
Diffstat (limited to 'docs')
-rw-r--r--docs/assets/js/application.js6
-rw-r--r--docs/index.html32
2 files changed, 28 insertions, 10 deletions
diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js
index 30677829e..aaf76e0f0 100644
--- a/docs/assets/js/application.js
+++ b/docs/assets/js/application.js
@@ -5,6 +5,7 @@ $(document).ready(function(){
prettyPrint();
+
// scroll spy logic
// ================
@@ -19,7 +20,6 @@ $(document).ready(function(){
return $(id).offset().top;
});
-
function setButton(id) {
nav.parent("li").removeClass('active');
$(nav[$.inArray(id, targets)]).parent("li").addClass('active');
@@ -48,10 +48,10 @@ $(document).ready(function(){
// ===============================
$("body").bind("click", function (e) {
- $('a.menu').parent("li").removeClass("open");
+ $('.dropdown-toggle').parent("li").removeClass("open");
});
- $("a.menu").click(function (e) {
+ $(".dropdown-toggle").click(function (e) {
var $li = $(this).parent("li").toggleClass('open');
return false;
});
diff --git a/docs/index.html b/docs/index.html
index bc0e216ab..cbc482002 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -34,10 +34,10 @@
<!-- Topbar
================================================== -->
<div class="topbar">
- <div class="fill">
+ <div class="wrapper">
<div class="container">
<h3><a href="#">Bootstrap</a></h3>
- <ul>
+ <ul class="nav">
<li class="active"><a href="#masthead">Overview</a></li>
<li><a href="#about">About</a></li>
<li><a href="#grid-system">Grid</a></li>
@@ -901,22 +901,31 @@
<h2>Fixed topbar</h2>
<div class="topbar-wrapper" style="z-index: 5;">
<div class="topbar">
- <div class="fill">
+ <div class="wrapper">
<div class="container">
<h3><a href="#">Project Name</a></h3>
- <ul>
+ <ul class="nav">
<li class="active"><a href="#">Home</a></li>
<li><a href="#">Link</a></li>
<li><a href="#">Link</a></li>
<li><a href="#">Link</a></li>
+ <li class="dropdown">
+ <a href="#" class="dropdown-toggle">Dropdown</a>
+ <ul class="dropdown-menu">
+ <li><a href="#">Secondary link</a></li>
+ <li><a href="#">Something else here</a></li>
+ <li class="divider"></li>
+ <li><a href="#">Another link</a></li>
+ </ul>
+ </li>
</ul>
<form action="">
<input type="text" placeholder="Search" />
</form>
<ul class="nav secondary-nav">
- <li class="menu">
- <a href="#" class="menu">Dropdown</a>
- <ul class="menu-dropdown">
+ <li class="dropdown">
+ <a href="#" class="dropdown-toggle">Dropdown</a>
+ <ul class="dropdown-menu">
<li><a href="#">Secondary link</a></li>
<li><a href="#">Something else here</a></li>
<li class="divider"></li>
@@ -960,6 +969,15 @@
<li><a href="#">Messages</a></li>
<li><a href="#">Settings</a></li>
<li><a href="#">Contact</a></li>
+ <li class="dropdown">
+ <a href="#" class="dropdown-toggle">Dropdown</a>
+ <ul class="dropdown-menu">
+ <li><a href="#">Secondary link</a></li>
+ <li><a href="#">Something else here</a></li>
+ <li class="divider"></li>
+ <li><a href="#">Another link</a></li>
+ </ul>
+ </li>
</ul>
<pre class="prettyprint linenums">
&lt;ul class="tabs"&gt;