diff options
| author | Mark Otto <[email protected]> | 2011-08-21 20:33:54 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-08-21 20:33:54 -0700 |
| commit | 34a19915f4f8b53eb7a5f2ffa4c87f7d47853827 (patch) | |
| tree | b19acf3b786b3c4e0af9a1ffc44f3e08f82ed591 /docs | |
| parent | 027538e66d633b15c9074b14d206602ad8fb42a1 (diff) | |
| parent | 842ad01fce710c50dc9c0174ab790f91e66c46b1 (diff) | |
| download | bootstrap-34a19915f4f8b53eb7a5f2ffa4c87f7d47853827.tar.xz bootstrap-34a19915f4f8b53eb7a5f2ffa4c87f7d47853827.zip | |
resolve conflicts
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/assets/css/docs.css | 3 | ||||
| -rw-r--r-- | docs/assets/js/application.js | 21 | ||||
| -rw-r--r-- | docs/index.html | 97 |
3 files changed, 62 insertions, 59 deletions
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index ede141ce5..bae49064a 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; 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; }); diff --git a/docs/index.html b/docs/index.html index efcf19746..eec45ec71 100644 --- a/docs/index.html +++ b/docs/index.html @@ -32,21 +32,23 @@ <body onload="prettyPrint();"> <div class="topbar"> - <div class="container"> - <h3><a href="#">Bootstrap</a></h3> - <ul> - <li class="active"><a href="#masthead">Overview</a></li> - <li><a href="#about">About</a></li> - <li><a href="#grid-system">Grid</a></li> - <li><a href="#layouts">Layouts</a></li> - <li><a href="#typography">Typography</a></li> - <li><a href="#tables">Tables</a></li> - <li><a href="#forms">Forms</a></li> - <li><a href="#navigation">Navigation</a></li> - <li><a href="#alerts">Alerts</a></li> - <li><a href="#popovers">Popovers</a></li> - <li><a href="#less">Less</a></li> - </ul> + <div class="fill"> + <div class="container"> + <h3><a href="#">Bootstrap</a></h3> + <ul> + <li class="active"><a href="#masthead">Overview</a></li> + <li><a href="#about">About</a></li> + <li><a href="#grid-system">Grid</a></li> + <li><a href="#layouts">Layouts</a></li> + <li><a href="#typography">Typography</a></li> + <li><a href="#tables">Tables</a></li> + <li><a href="#forms">Forms</a></li> + <li><a href="#navigation">Navigation</a></li> + <li><a href="#alerts">Alerts</a></li> + <li><a href="#popovers">Popovers</a></li> + <li><a href="#less">Less</a></li> + </ul> + </div> </div> </div> @@ -831,8 +833,10 @@ <h3>Example buttons</h3> <p>Button styles can be applied to anything with the <code>.btn</code> applied. Typically you’ll want to apply these to only <code><a></code>, <code><button></code>, and select <code><input></code> elements. Here’s how it looks:</p> <div class="well" style="padding: 14px 19px;"> - <button type="submit" class="btn primary">Submit</button> - <button type="submit" class="btn">Cancel</button> + <form> + <button type="submit" class="btn primary">Submit</button> + <button type="submit" class="btn">Cancel</button> + </form> </div> <h3>Alternate sizes</h3> <p>Fancy larger or smaller buttons? Have at it!</p> @@ -846,6 +850,7 @@ </div> <h3>Disabled state</h3> <p>For buttons that are not active or are disabled by the app for one reason or another, use the disabled state. That’s <code>.disabled</code> for links and <code>:disabled</code> for <code><button></code> elements.</p> + <p><strong>Note:</strong> If you're developing for older browsers like IE8 or below -- you're going to want to use the <code>.disabled</code> class for <code><button></code> elements as well. <h4>Links</h4> <div class="well"> <a href="#" class="btn large primary disabled">Primary action</a> @@ -853,8 +858,10 @@ </div> <h4>Buttons</h4> <div class="well"> - <button class="btn large primary" disabled>Primary action</button> - <button class="btn large" disabled>Action</button> + <form> + <button class="btn large primary disabled" disabled>Primary action</button> + <button class="btn large disabled" disabled>Action</button> + </form> </div> </div> </div> @@ -869,28 +876,30 @@ <h2>Fixed topbar</h2> <div class="topbar-wrapper" style="z-index: 5;"> <div class="topbar"> - <div class="container fixed"> - <h3><a href="#">Project Name</a></h3> - <ul> - <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> - </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><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> + <div class="fill"> + <div class="container fixed"> + <h3><a href="#">Project Name</a></h3> + <ul> + <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> + </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><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> + </div> </div> </div> </div> <!-- topbar-wrapper --> @@ -1089,7 +1098,7 @@ <p>Modals—dialogs or lightboxes—are great for contextual actions in situations where it’s important that the background context be maintained.</p> </div> <div class="span12 columns"> - <div class="well" style="background-color: rgba(0,0,0,0.5); border: none; padding: 40px;"> + <div class="well" style="background-color: #888; border: none; padding: 40px;"> <!-- Modal --> <div class="modal" style="position: relative; top: auto; left: auto; margin: 0 auto; z-index: 1"> <div class="modal-header"> @@ -1157,7 +1166,11 @@ Lorem ipsum dolar sit amet illo error <a href="#" title="below">ipsum</a> verita </div> </div> </div> +<<<<<<< HEAD <img class="large-bird" src="assets/img/bird.png" width="220px" height="145px"> +======= + <img class="large-bird" src="assets/img/bird.png" width="220px" height="151px"> +>>>>>>> 842ad01fce710c50dc9c0174ab790f91e66c46b1 </div> </div> </div> |