diff options
| author | Mark Otto <[email protected]> | 2011-08-21 20:38:57 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-08-21 20:38:57 -0700 |
| commit | b59b82b032b2ef868e113b40014f36ff0d22adcd (patch) | |
| tree | 46d36989b971bca3c92aa8cdfeded2c4a3fb77b4 /docs/index.html | |
| parent | 14b77f3a2164a5348ec8d9841ddc3ace27a64e37 (diff) | |
| parent | 34a19915f4f8b53eb7a5f2ffa4c87f7d47853827 (diff) | |
| download | bootstrap-b59b82b032b2ef868e113b40014f36ff0d22adcd.tar.xz bootstrap-b59b82b032b2ef868e113b40014f36ff0d22adcd.zip | |
updated to resolve conflicts
Diffstat (limited to 'docs/index.html')
| -rw-r--r-- | docs/index.html | 175 |
1 files changed, 88 insertions, 87 deletions
diff --git a/docs/index.html b/docs/index.html index ce2a96c22..3ad2bb08b 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> @@ -359,64 +361,54 @@ <div class="span4 columns"> <h4>Unordered <code><ul></code></h4> <ul> - <li>Jeremy Bixby</li> - <li>Robert Dezure</li> - <li>Josh Washington</li> - <li>Anton Capresi</li> - <li>My Team Mates + <li>Lorem ipsum dolor sit amet</li> + <li>Consectetur adipiscing elit</li> + <li>Integer molestie lorem at massa</li> + <li>Facilisis in pretium nisl aliquet</li> + <li>Nulla volutpat aliquam velit <ul> - <li>George Castanza</li> - <li>Jerry Seinfeld</li> - <li>Cosmo Kramer</li> - <li>Elaine Bennis</li> - <li>Newman</li> + <li>Phasellus iaculis neque</li> + <li>Purus sodales ultricies</li> + <li>Vestibulum laoreet porttitor sem</li> + <li>Ac tristique libero volutpat at</li> </ul> </li> - <li>John Jacob</li> - <li>Paul Pierce</li> - <li>Kevin Garnett</li> + <li>Faucibus porta lacus fringilla vel</li> + <li>Aenean sit amet erat nunc</li> + <li>Eget porttitor lorem</li> </ul> </div> <div class="span4 columns"> <h4>Unstyled <code><ul.unstyled></code></h4> <ul class="unstyled"> - <li>Jeremy Bixby</li> - <li>Robert Dezure</li> - <li>Josh Washington</li> - <li>Anton Capresi</li> - <li>My Team Mates + <li>Lorem ipsum dolor sit amet</li> + <li>Consectetur adipiscing elit</li> + <li>Integer molestie lorem at massa</li> + <li>Facilisis in pretium nisl aliquet</li> + <li>Nulla volutpat aliquam velit <ul> - <li>George Castanza</li> - <li>Jerry Seinfeld</li> - <li>Cosmo Kramer</li> - <li>Elaine Bennis</li> - <li>Newman</li> + <li>Phasellus iaculis neque</li> + <li>Purus sodales ultricies</li> + <li>Vestibulum laoreet porttitor sem</li> + <li>Ac tristique libero volutpat at</li> </ul> </li> - <li>John Jacob</li> - <li>Paul Pierce</li> - <li>Kevin Garnett</li> + <li>Faucibus porta lacus fringilla vel</li> + <li>Aenean sit amet erat nunc</li> + <li>Eget porttitor lorem</li> </ul> </div> <div class="span4 columns"> <h4>Ordered <code><ol></code></h4> <ol> - <li>Jeremy Bixby</li> - <li>Robert Dezure</li> - <li>Josh Washington</li> - <li>Anton Capresi</li> - <li>My Team Mates - <ol> - <li>George Castanza</li> - <li>Jerry Seinfeld</li> - <li>Cosmo Kramer</li> - <li>Elaine Bennis</li> - <li>Newman</li> - </ol> - </li> - <li>John Jacob</li> - <li>Paul Pierce</li> - <li>Kevin Garnett</li> + <li>Lorem ipsum dolor sit amet</li> + <li>Consectetur adipiscing elit</li> + <li>Integer molestie lorem at massa</li> + <li>Facilisis in pretium nisl aliquet</li> + <li>Nulla volutpat aliquam velit</li> + <li>Faucibus porta lacus fringilla vel</li> + <li>Aenean sit amet erat nunc</li> + <li>Eget porttitor lorem</li> </ol> </div> <div class="span4 columns"> @@ -840,8 +832,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> @@ -855,6 +849,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> @@ -862,8 +857,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> @@ -878,28 +875,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 --> @@ -1098,7 +1097,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"> @@ -1166,13 +1165,15 @@ Lorem ipsum dolar sit amet illo error <a href="#" title="below">ipsum</a> verita </div> </div> </div> - <img class="large-bird" src="assets/img/bird.png" width="220px" height="48px"> +<<<<<<< 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> </div> <!-- /row --> - - </section> |